← Back to branch summary

~alan-griffiths/unity-system-compositor/mir-1.0-compat

~alan-griffiths/unity-system-compositor/mir-1.0-compat

Viewing all changes in revision 184.

Committer: Daniel van Vugt
Date: 2015-03-25 07:45:57 UTC
mfrom: (175.1.26 trunk)
Revision ID: daniel.van.vugt@canonical.com-20150325074557-geriyjj6a6kew6n9

Merge latest trunk. Now identical.

files added:
src/screen_hardware.h

tests/unit-tests/advanceable_timer.cpp

tests/unit-tests/advanceable_timer.h

tests/unit-tests/test_mir_screen.cpp

tests/unit-tests/test_screen_event_handler.cpp

files renamed:
src/screen_state_handler.cpp => src/mir_screen.cpp

src/screen_state_handler.h => src/mir_screen.h

src/dbus_screen_observer.h => src/screen.h

src/powerkey_handler.cpp => src/screen_event_handler.cpp

src/powerkey_handler.h => src/screen_event_handler.h

files modified:
debian/control

src/CMakeLists.txt

src/dbus_screen.cpp

src/dbus_screen.h

src/powerd_mediator.h

src/server.cpp

src/server.h

src/shell.cpp

src/system_compositor.cpp

src/system_compositor.h

tests/unit-tests/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

src/CMakeLists.txt

src/dbus_screen.cpp

src/dbus_screen.h

src/mir_screen.cpp

src/mir_screen.h

src/powerd_mediator.h

src/screen_event_handler.cpp

src/screen_event_handler.h

src/screen_hardware.h

src/system_compositor.cpp

src/system_compositor.h

tests/unit-tests/CMakeLists.txt

tests/unit-tests/advanceable_timer.cpp

tests/unit-tests/advanceable_timer.h

tests/unit-tests/test_mir_screen.cpp

tests/unit-tests/test_screen_event_handler.cpp

Older »