← Back to branch summary

~raof/mir/provide-event-fd

~raof/mir/provide-event-fd

Viewing all changes in revision 2361.

Committer: Christopher James Halse Rogers
Date: 2015-04-01 01:08:12 UTC
mfrom: (2239.1.207 development-branch)
Revision ID: christopher.halse.rogers@canonical.com-20150401010812-g3obkn13xk5cquue

Merge trunk

files removed:
examples/server_example_fullscreen_placement_strategy.cpp

examples/server_example_fullscreen_placement_strategy.h

include/server/mir/shell/null_window_manager.h

src/server/shell/null_window_manager.cpp

files renamed:
include/server/mir/scene/placement_strategy.h => src/include/server/mir/scene/placement_strategy.h

include/server/mir/scene/surface_configurator.h => src/include/server/mir/scene/surface_configurator.h

files modified:
benchmarks/frame-uniformity/touch_measuring_client.cpp

debian/changelog

examples/CMakeLists.txt

examples/demo_client_display_config.c

examples/eglapp.c

examples/eglsquare.cpp

examples/fingerpaint.c

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/mir_surface.h

include/server/mir/server.h

playground/demo-shell/demo_shell.cpp

src/client/mir_surface_api.cpp

src/client/symbols.map

src/platforms/android/server/display.cpp

src/platforms/android/server/display.h

src/platforms/android/server/display_component_factory.h

src/platforms/android/server/display_configuration.cpp

src/platforms/android/server/display_configuration.h

src/platforms/android/server/fb_device.cpp

src/platforms/android/server/fb_device.h

src/platforms/android/server/hal_component_factory.cpp

src/platforms/android/server/hal_component_factory.h

src/platforms/android/server/hwc_blanking_control.cpp

src/platforms/android/server/hwc_configuration.h

src/server/graphics/nested/host_connection.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/nested_output.cpp

src/server/scene/surface_controller.h

src/server/server.cpp

src/server/shell/CMakeLists.txt

src/server/shell/abstract_shell.cpp

src/server/symbols.map

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/throwback/test_client_input.cpp

tests/include/mir_test_doubles/stub_display_builder.h

tests/include/mir_test_doubles/stub_display_configuration.h

tests/include/mir_test_doubles/stub_host_connection.h

tests/unit-tests/dispatch/test_threaded_dispatcher.cpp

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

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

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

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

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

tests/unit-tests/graphics/nested/test_nested_display_buffer.cpp

Show diffs side-by-side

added added

removed removed

benchmarks/frame-uniformity/touch_measuring_client.cpp

debian/changelog

examples/CMakeLists.txt

examples/demo_client_display_config.c

examples/eglapp.c

examples/eglsquare.cpp

examples/fingerpaint.c

examples/server_example_fullscreen_placement_strategy.cpp

examples/server_example_fullscreen_placement_strategy.h

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/mir_surface.h

include/server/mir/server.h

include/server/mir/shell/null_window_manager.h

playground/demo-shell/demo_shell.cpp

src/client/mir_surface_api.cpp

src/client/symbols.map

src/platforms/android/server/display.cpp

src/platforms/android/server/display.h

src/platforms/android/server/display_component_factory.h

src/platforms/android/server/display_configuration.cpp

src/platforms/android/server/display_configuration.h

src/platforms/android/server/fb_device.cpp

src/platforms/android/server/fb_device.h

src/platforms/android/server/hal_component_factory.cpp

src/platforms/android/server/hal_component_factory.h

src/platforms/android/server/hwc_blanking_control.cpp

src/platforms/android/server/hwc_configuration.h

src/server/graphics/nested/host_connection.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/nested_output.cpp

src/server/scene/surface_controller.h

src/server/server.cpp

src/server/shell/CMakeLists.txt

src/server/shell/abstract_shell.cpp

src/server/shell/null_window_manager.cpp

src/server/symbols.map

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/throwback/test_client_input.cpp

tests/include/mir_test_doubles/stub_display_builder.h

tests/include/mir_test_doubles/stub_display_configuration.h

tests/include/mir_test_doubles/stub_host_connection.h

tests/unit-tests/dispatch/test_threaded_dispatcher.cpp

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

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

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

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

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

tests/unit-tests/graphics/nested/test_nested_display_buffer.cpp

Older »