← Back to branch summary

~vanvugt/mir/log-level

~vanvugt/mir/log-level

Viewing all changes in revision 2232.

Committer: Daniel van Vugt
Date: 2015-01-28 03:32:07 UTC
mfrom: (2201.2.67 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20150128033207-uyff8rl7v265fnnp

Merge latest trunk and fix conflicts.

files added:
include/common/mir/events

include/common/mir/events/event_builders.h

include/common/mir/frontend

src/common/events

src/common/events/CMakeLists.txt

src/common/events/event_builders.cpp

tests/include/mir_test_doubles/triggered_main_loop.h

tests/mir_test_doubles/triggered_main_loop.cpp

tests/mir_test_framework/udev_recordings/joystick-detection.ioctl

tests/mir_test_framework/udev_recordings/joystick-detection.umockdev

tests/mir_test_framework/udev_recordings/mt-screen-detection.ioctl

tests/mir_test_framework/udev_recordings/mt-screen-detection.umockdev

tests/unit-tests/scene/test_default_shell.cpp

files renamed:
include/server/mir/frontend/surface_id.h => include/common/mir/frontend/surface_id.h

files modified:
common-ABI-sha1sums

include/server/mir/frontend/shell.h

include/server/mir/scene/placement_strategy.h

include/server/mir/scene/session_coordinator.h

include/server/mir/shell/focus_controller.h

include/server/mir/shell/session_coordinator_wrapper.h

platform-ABI-sha1sums

server-ABI-sha1sums

src/common/CMakeLists.txt

src/common/symbols.map

src/server/scene/application_session.cpp

src/server/scene/default_configuration.cpp

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/surface_controller.cpp

src/server/scene/surface_controller.h

src/server/scene/surface_event_source.cpp

src/server/shell/default_configuration.cpp

src/server/shell/default_shell.cpp

src/server/shell/default_shell.h

src/server/shell/session_coordinator_wrapper.cpp

tests/include/mir_test_doubles/stub_input_channel.h

tests/integration-tests/client/test_mirsurface.cpp

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

tests/integration-tests/test_default_shell.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_framework/udev_recordings/synaptics-touchpad.ioctl

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

tests/unit-tests/scene/CMakeLists.txt

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface_controller.cpp

Show diffs side-by-side

added added

removed removed

common-ABI-sha1sums

include/common/mir/events/

include/common/mir/events/event_builders.h

include/common/mir/frontend/

include/common/mir/frontend/surface_id.h

include/server/mir/frontend/shell.h

include/server/mir/scene/placement_strategy.h

include/server/mir/scene/session_coordinator.h

include/server/mir/shell/focus_controller.h

include/server/mir/shell/session_coordinator_wrapper.h

platform-ABI-sha1sums

server-ABI-sha1sums

src/common/CMakeLists.txt

src/common/events/

src/common/events/CMakeLists.txt

src/common/events/event_builders.cpp

src/common/symbols.map

src/server/scene/application_session.cpp

src/server/scene/default_configuration.cpp

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/surface_controller.cpp

src/server/scene/surface_controller.h

src/server/scene/surface_event_source.cpp

src/server/shell/default_configuration.cpp

src/server/shell/default_shell.cpp

src/server/shell/default_shell.h

src/server/shell/session_coordinator_wrapper.cpp

tests/include/mir_test_doubles/stub_input_channel.h

tests/include/mir_test_doubles/triggered_main_loop.h

tests/integration-tests/client/test_mirsurface.cpp

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

tests/integration-tests/test_default_shell.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_doubles/triggered_main_loop.cpp

tests/mir_test_framework/udev_recordings/joystick-detection.ioctl

tests/mir_test_framework/udev_recordings/joystick-detection.umockdev

tests/mir_test_framework/udev_recordings/mt-screen-detection.ioctl

tests/mir_test_framework/udev_recordings/mt-screen-detection.umockdev

tests/mir_test_framework/udev_recordings/synaptics-touchpad.ioctl

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

tests/unit-tests/scene/CMakeLists.txt

tests/unit-tests/scene/test_default_shell.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface_controller.cpp

Older »