← Back to branch summary

~unity-system-compositor-team/unity-system-compositor/0.1

~unity-system-compositor-team/unity-system-compositor/0.1

Viewing all changes in revision 251.

Committer: Cemil Azizoglu
Date: 2015-09-15 17:49:46 UTC
mfrom: (242.2.10 trunk)
Revision ID: cemil.azizoglu@canonical.com-20150915174946-0k826xvlmiyigkuv

Merge trunk

files added:
src/com.canonical.Unity.Input.xml

src/dbus_connection_thread.cpp

src/dbus_connection_thread.h

src/display_configuration_policy.cpp

src/display_configuration_policy.h

src/input_configuration.h

src/mir_input_configuration.cpp

src/mir_input_configuration.h

src/unity_input_service.cpp

src/unity_input_service.h

tests/integration-tests/test_unity_input_service.cpp

files renamed:
src/com.canonical.Unity.Screen.conf => src/com.canonical.Unity.conf

files modified:
debian/unity-system-compositor.install

spinner/eglapp.cpp

src/CMakeLists.txt

src/server.cpp

src/server.h

src/system_compositor.cpp

src/system_compositor.h

src/unity_screen_service.cpp

src/unity_screen_service.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/test_unity_screen_service.cpp

tests/unit-tests/test_screen_event_handler.cpp

Show diffs side-by-side

added added

removed removed

debian/unity-system-compositor.install

spinner/eglapp.cpp

src/CMakeLists.txt

src/com.canonical.Unity.Input.xml

src/com.canonical.Unity.conf

src/dbus_connection_thread.cpp

src/dbus_connection_thread.h

src/display_configuration_policy.cpp

src/display_configuration_policy.h

src/input_configuration.h

src/mir_input_configuration.cpp

src/mir_input_configuration.h

src/system_compositor.cpp

src/system_compositor.h

src/unity_input_service.cpp

src/unity_input_service.h

src/unity_screen_service.cpp

src/unity_screen_service.h

tests/integration-tests/CMakeLists.txt

tests/integration-tests/test_unity_input_service.cpp

tests/integration-tests/test_unity_screen_service.cpp

tests/unit-tests/test_screen_event_handler.cpp

Older »