← Back to branch summary

~raof/mir/the-least-dirty-thing

~raof/mir/the-least-dirty-thing

Viewing all changes in revision 1867.

Committer: Christopher James Halse Rogers
Date: 2014-10-13 05:12:58 UTC
mfrom: (1840.1.131 development-branch)
Revision ID: christopher.halse.rogers@canonical.com-20141013051258-l58su0qy4biesvbw

Merge trunk

files modified:
client-ABI-sha1sums

include/server/mir/default_server_configuration.h

server-ABI-sha1sums

src/common/symbols.map

src/platform/symbols.map

src/server/input/android/android_input_dispatcher.cpp

src/server/input/android/android_input_dispatcher.h

src/server/input/android/android_input_manager.cpp

src/server/input/default_configuration.cpp

src/server/symbols.map

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/unit-tests/input/android/test_android_input_dispatcher.cpp

tests/unit-tests/input/android/test_android_input_manager.cpp

Show diffs side-by-side

added added

removed removed

client-ABI-sha1sums

include/server/mir/default_server_configuration.h

server-ABI-sha1sums

src/common/symbols.map

src/platform/symbols.map

src/server/input/android/android_input_dispatcher.cpp

src/server/input/android/android_input_dispatcher.h

src/server/input/android/android_input_manager.cpp

src/server/input/default_configuration.cpp

src/server/symbols.map

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/unit-tests/input/android/test_android_input_dispatcher.cpp

tests/unit-tests/input/android/test_android_input_manager.cpp

Older »