← Back to branch summary

~raof/mir/use-dma-buf

~raof/mir/use-dma-buf

Viewing all changes in revision 503.

Committer: Christopher James Halse Rogers
Date: 2013-04-10 08:14:52 UTC
mfrom: (473.1.105 trunk)
Revision ID: raof@ubuntu.com-20130410081452-l5ec0ggtijlbcpaq

Merge trunk to resolve conflicts

files added:
cmake/FindGFlags.cmake

include/server/mir/asio_main_loop.h

include/server/mir/main_loop.h

src/server/asio_main_loop.cpp

src/server/graphics/android/fb_swapper.cpp

src/server/graphics/android/fb_swapper.h

src/shared/input

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/graphics/android/test_fb_swapper.cpp

tests/unit-tests/test_asio_main_loop.cpp

files removed:
include/server/mir/signal_dispatcher.h

include/shared/mir_toolkit/input

src/server/input/android/dummy_input_dispatcher_policy.h

src/server/input/android/transport

src/server/signal_dispatcher.cpp

tests/integration-tests/process/test_signal_dispatcher.cpp

files renamed:
include/shared/mir_toolkit/input/event.h => include/shared/mir_toolkit/event.h

src/server/input/android/transport/CMakeLists.txt => src/shared/input/CMakeLists.txt

src/server/input/android/transport/android_input_lexicon.cpp => src/shared/input/android_input_lexicon.cpp

files modified:
3rd_party/android-input/android/CMakeLists.txt

3rd_party/android-input/android/frameworks/base/include/androidfw/KeyCharacterMap.h

3rd_party/android-input/android/frameworks/base/services/input/KeyCharacterMap.cpp

CMakeLists.txt

examples/demo_client.c

examples/demo_client_accelerated.cpp

examples/demo_client_unaccelerated.c

examples/eglapp.c

include/client/mir_toolkit/mir_client_library.h

include/server/mir/default_server_configuration.h

include/server/mir/input/event_filter.h

include/server/mir/server_configuration.h

include/shared/mir/input/android/android_input_lexicon.h

include/shared/mir_toolkit/c_types.h

include/test/mir_test_doubles/mock_buffer.h

include/test/mir_test_doubles/mock_event_filter.h

src/client/CMakeLists.txt

src/client/input/android_input_receiver.cpp

src/client/input/android_input_receiver.h

src/client/input/android_input_receiver_thread.h

src/client/input/input_platform.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_surface.cpp

src/client/mir_surface.h

src/server/CMakeLists.txt

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/frontend/message_processor.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/socket_session.cpp

src/server/frontend/socket_session.h

src/server/graphics/android/CMakeLists.txt

src/server/input/android/CMakeLists.txt

src/server/input/android/event_filter_dispatcher_policy.cpp

src/server/input/android/event_filter_dispatcher_policy.h

src/server/logging/CMakeLists.txt

src/server/logging/glog_logger.cpp

src/server/run_mir.cpp

src/shared/CMakeLists.txt

src/shared/protobuf/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_focus_management_api.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/acceptance-tests/test_surfaceloop.cpp

tests/client-language/c89.c

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/cucumber/test_session_management_context.cpp

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

tests/integration-tests/process/CMakeLists.txt

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_protobuf_communicator.cpp

tests/unit-tests/graphics/android/CMakeLists.txt

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

Show diffs side-by-side

added added

removed removed

3rd_party/android-input/android/CMakeLists.txt

3rd_party/android-input/android/frameworks/base/include/androidfw/KeyCharacterMap.h

3rd_party/android-input/android/frameworks/base/services/input/KeyCharacterMap.cpp

cmake/FindGFlags.cmake

examples/demo_client.c

examples/demo_client_accelerated.cpp

examples/demo_client_unaccelerated.c

examples/eglapp.c

include/client/mir_toolkit/mir_client_library.h

include/server/mir/asio_main_loop.h

include/server/mir/default_server_configuration.h

include/server/mir/input/event_filter.h

include/server/mir/main_loop.h

include/server/mir/server_configuration.h

include/server/mir/signal_dispatcher.h

include/shared/mir/input/android/android_input_lexicon.h

include/shared/mir_toolkit/c_types.h

include/shared/mir_toolkit/event.h

include/shared/mir_toolkit/input/

include/test/mir_test_doubles/mock_buffer.h

include/test/mir_test_doubles/mock_event_filter.h

src/client/CMakeLists.txt

src/client/input/android_input_receiver.cpp

src/client/input/android_input_receiver.h

src/client/input/android_input_receiver_thread.h

src/client/input/input_platform.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_surface.cpp

src/client/mir_surface.h

src/server/CMakeLists.txt

src/server/asio_main_loop.cpp

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/frontend/message_processor.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/socket_session.cpp

src/server/frontend/socket_session.h

src/server/graphics/android/CMakeLists.txt

src/server/graphics/android/fb_swapper.cpp

src/server/graphics/android/fb_swapper.h

src/server/input/android/CMakeLists.txt

src/server/input/android/dummy_input_dispatcher_policy.h

src/server/input/android/event_filter_dispatcher_policy.cpp

src/server/input/android/event_filter_dispatcher_policy.h

src/server/input/android/transport/

src/server/logging/CMakeLists.txt

src/server/logging/glog_logger.cpp

src/server/run_mir.cpp

src/server/signal_dispatcher.cpp

src/shared/CMakeLists.txt

src/shared/input/

src/shared/input/CMakeLists.txt

src/shared/input/android_input_lexicon.cpp

src/shared/protobuf/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_focus_management_api.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/acceptance-tests/test_surfaceloop.cpp

tests/client-language/c89.c

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/cucumber/test_session_management_context.cpp

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

tests/integration-tests/process/CMakeLists.txt

tests/integration-tests/process/test_signal_dispatcher.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/frontend/test_protobuf_communicator.cpp

tests/unit-tests/graphics/android/CMakeLists.txt

tests/unit-tests/graphics/android/test_fb_swapper.cpp

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

tests/unit-tests/test_asio_main_loop.cpp

Older »