← Back to branch summary

~vanvugt/mir/double

~vanvugt/mir/double

Viewing all changes in revision 1780.

Committer: Daniel van Vugt
Date: 2014-10-13 06:50:21 UTC
mfrom: (1608.120.218 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20141013065021-wdxrnn7vvw0jvftq

Merge latest development-branch and fix conflicts.

files added:
tests/integration-tests/surface_composition.cpp

files modified:
include/server/mir/default_server_configuration.h

server-ABI-sha1sums

src/common/fd/fd_socket_transmission.cpp

src/common/input/android/android_input_receiver.cpp

src/common/symbols.map

src/include/common/mir/fd_socket_transmission.h

src/include/server/mir/compositor/buffer_stream.h

src/platform/symbols.map

src/server/compositor/buffer_bundle.h

src/server/compositor/buffer_queue.cpp

src/server/compositor/buffer_queue.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/frontend/published_socket_connector.cpp

src/server/frontend/socket_messenger.cpp

src/server/frontend/socket_messenger.h

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/scene/basic_surface.cpp

src/server/scene/prompt_session_manager_impl.cpp

src/server/symbols.map

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/include/mir_test_doubles/mock_buffer_bundle.h

tests/include/mir_test_doubles/mock_buffer_stream.h

tests/include/mir_test_doubles/stub_buffer_stream.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/frontend/test_session_mediator_report.cpp

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

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

tests/integration-tests/test_exchange_buffer.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

include/server/mir/default_server_configuration.h

server-ABI-sha1sums

src/common/fd/fd_socket_transmission.cpp

src/common/input/android/android_input_receiver.cpp

src/common/symbols.map

src/include/common/mir/fd_socket_transmission.h

src/include/server/mir/compositor/buffer_stream.h

src/platform/symbols.map

src/server/compositor/buffer_bundle.h

src/server/compositor/buffer_queue.cpp

src/server/compositor/buffer_queue.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/frontend/published_socket_connector.cpp

src/server/frontend/socket_messenger.cpp

src/server/frontend/socket_messenger.h

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/scene/basic_surface.cpp

src/server/scene/prompt_session_manager_impl.cpp

src/server/symbols.map

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/include/mir_test_doubles/mock_buffer_bundle.h

tests/include/mir_test_doubles/mock_buffer_stream.h

tests/include/mir_test_doubles/stub_buffer_stream.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/frontend/test_session_mediator_report.cpp

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

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

tests/integration-tests/surface_composition.cpp

tests/integration-tests/test_exchange_buffer.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 »