← Back to branch summary

~alan-griffiths/mir/death-to-SurfaceConfigurator

~alan-griffiths/mir/death-to-SurfaceConfigurator

Viewing all changes in revision 2446.

Committer: Alan Griffiths
Date: 2015-04-01 10:12:34 UTC
mfrom: (2444.1.3 development-branch)
Revision ID: alan@octopull.co.uk-20150401101234-3hlk30yd03dzu35r

merge lp:mir

files removed:
include/server/mir/shell/null_window_manager.h

src/server/shell/null_window_manager.cpp

files renamed:
src/server/shell/default_window_manager.h => src/include/server/mir/shell/default_window_manager.h

files modified:
playground/demo-shell/demo_shell.cpp

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/shell/CMakeLists.txt

src/server/shell/abstract_shell.cpp

src/server/shell/default_window_manager.cpp

src/server/symbols.map

tests/include/mir_test_doubles/stub_display_builder.h

tests/include/mir_test_doubles/stub_display_configuration.h

tests/integration-tests/test_default_window_manager.cpp

tests/mir_test_framework/fake_event_hub_server_configuration.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/shell/test_default_window_manager.cpp

Show diffs side-by-side

added added

removed removed

include/server/mir/shell/null_window_manager.h

playground/demo-shell/demo_shell.cpp

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/shell/CMakeLists.txt

src/server/shell/abstract_shell.cpp

src/server/shell/default_window_manager.cpp

src/server/shell/null_window_manager.cpp

src/server/symbols.map

tests/include/mir_test_doubles/stub_display_builder.h

tests/include/mir_test_doubles/stub_display_configuration.h

tests/integration-tests/test_default_window_manager.cpp

tests/mir_test_framework/fake_event_hub_server_configuration.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/shell/test_default_window_manager.cpp

Older »