« back to all changes in this revision
Viewing changes to src/server/report/lttng/compositor_report_tp.h
- Committer: Daniel van Vugt
- Date: 2015-04-28 07:54:10 UTC
- mfrom: (2517 development-branch)
- mto: This revision was merged to the branch mainline in revision 2673.
- Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.
- files added:
- doc/kernel_requirements.md
- include/client/mir
- include/platform/mir/input
- playground/demo-shell/typo
- snappy
- src/include/client/mir/input
- src/include/common/mir/events
- src/platform/udev
- files removed:
- examples/server_example_fullscreen_placement_strategy.cpp
- include/common/mir/input
- src/platforms/common/server
- tools/abi_dumps
- files renamed:
- cmake/FindGtest.cmake => cmake/FindGtestGmock.cmake
- debian/libmircommon3.install => debian/libmircommon4.install
- debian/libmirserver29.install => debian/libmirserver31.install
- debian/mir-client-platform-android.install => debian/mir-client-platform-android2.install
- debian/mir-client-platform-mesa.install => debian/mir-client-platform-mesa2.install
- debian/mir-platform-graphics-android.install => debian/mir-platform-graphics-android2.install
- debian/mir-platform-graphics-mesa.install => debian/mir-platform-graphics-mesa2.install
- include/common/mir/events/ => include/client/mir/events/
- include/common/mir_toolkit/client_types.h => include/client/mir_toolkit/client_types.h
- include/common/mir_toolkit/cursors.h => include/client/mir_toolkit/cursors.h
- include/common/mir_toolkit/event.h => include/client/mir_toolkit/event.h
- include/common/mir_toolkit/events/ => include/client/mir_toolkit/events/
- include/common/mir_toolkit/events/input/key_input_event.h => include/client/mir_toolkit/events/input/keyboard_event.h
- include/common/mir_toolkit/events/input/pointer_input_event.h => include/client/mir_toolkit/events/input/pointer_event.h
- include/common/mir_toolkit/events/input/touch_input_event.h => include/client/mir_toolkit/events/input/touch_event.h
- src/include/server/mir/input/input_report.h => include/platform/mir/input/input_report.h
- src/include/server/mir/compositor/scene_element.h => include/server/mir/compositor/scene_element.h
- examples/server_example_window_manager.h => include/server/mir/shell/window_manager.h
- include/server/mir/time/timer.h => include/server/mir/time/alarm_factory.h
- src/common/event.cpp => src/client/event.cpp
- src/common/events/ => src/client/events/
- src/common/input/ => src/client/input/
- src/include/common/mir/event_type_to_string.h => src/include/client/mir/event_type_to_string.h
- include/common/mir/input/input_platform.h => src/include/client/mir/input/input_platform.h
- include/common/mir_toolkit/events/event_deprecated.h => src/include/common/mir/events/event_private.h
- src/include/common/mir/udev/ => src/include/platform/mir/udev/
- include/server/mir/scene/placement_strategy.h => src/include/server/mir/scene/placement_strategy.h
- src/common/input/udev_wrapper.cpp => src/platform/udev/udev_wrapper.cpp
- src/server/frontend/surface_tracker.cpp => src/server/frontend/buffer_stream_tracker.cpp
- src/server/frontend/surface_tracker.h => src/server/frontend/buffer_stream_tracker.h
- src/server/graphics/nested/nested_display.cpp => src/server/graphics/nested/display.cpp
- src/server/graphics/nested/nested_display.h => src/server/graphics/nested/display.h
- src/server/graphics/nested/nested_output.cpp => src/server/graphics/nested/display_buffer.cpp
- src/server/graphics/nested/nested_output.h => src/server/graphics/nested/display_buffer.h
- tests/acceptance-tests/throwback/test_shell_control_of_surface_configuration.cpp => tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp
- tests/include/mir_test_framework/cross_process_sync.h => tests/include/mir_test/cross_process_sync.h
- tests/include/mir_test_doubles/stub_timer.h => tests/include/mir_test_doubles/stub_alarm.h
- tests/integration-tests/test_default_shell.cpp => tests/integration-tests/test_default_window_manager.cpp
- tests/mir_test_framework/cross_process_sync.cpp => tests/mir_test/cross_process_sync.cpp
- tests/unit-tests/scene/test_default_shell.cpp => tests/unit-tests/shell/test_default_window_manager.cpp
- files modified:
- .clang-format
added
removed
src/server/report/lttng/compositor_report_tp.h
