← Back to branch summary

~saviq/unity-system-compositor/use-cmake-extras

~saviq/unity-system-compositor/use-cmake-extras

Viewing all changes in revision 191.

Committer: Michał Sawicz
Date: 2015-06-03 18:54:42 UTC
mfrom: (189.2.27 trunk)
Revision ID: michal.sawicz@canonical.com-20150603185442-q46jq6zjx6bujyiu

Merge trunk

files added:
spinner/miregl.cpp

spinner/miregl.h

src/com.canonical.Unity.Screen.xml

src/dbus_connection_handle.cpp

src/dbus_connection_handle.h

src/dbus_event_loop.cpp

src/dbus_event_loop.h

src/dbus_message_handle.cpp

src/dbus_message_handle.h

src/generate_header_with_string_from_file.sh

src/scoped_dbus_error.h

src/screen_hardware.h

src/thread_name.cpp

src/thread_name.h

src/unity_screen_service.cpp

src/unity_screen_service.h

src/window_manager.cpp

src/window_manager.h

tests/integration-tests

tests/integration-tests/CMakeLists.txt

tests/integration-tests/dbus_bus.cpp

tests/integration-tests/dbus_bus.h

tests/integration-tests/dbus_client.cpp

tests/integration-tests/dbus_client.h

tests/integration-tests/run_command.cpp

tests/integration-tests/run_command.h

tests/integration-tests/test_dbus_event_loop.cpp

tests/integration-tests/test_external_spinner.cpp

tests/integration-tests/test_powerd_mediator.cpp

tests/integration-tests/test_unity_screen_service.cpp

tests/integration-tests/usc_test_helper_wait_for_signal.c

tests/integration-tests/wait_condition.h

tests/unit-tests/advanceable_timer.cpp

tests/unit-tests/advanceable_timer.h

tests/unit-tests/fake_shared.h

tests/unit-tests/test_mir_screen.cpp

tests/unit-tests/test_screen_event_handler.cpp

files removed:
src/dbus_screen.cpp

src/dbus_screen.h

src/session_coordinator.cpp

src/session_coordinator.h

src/surface_coordinator.cpp

src/surface_coordinator.h

src/worker_thread.cpp

src/worker_thread.h

files renamed:
spinner/eglapp.c => spinner/eglapp.cpp

spinner/eglspinner.c => spinner/eglspinner.cpp

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

src/server_configuration.cpp => src/server.cpp

src/server_configuration.h => src/server.h

files modified:
CMakeLists.txt

debian/changelog

debian/control

spinner/CMakeLists.txt

spinner/eglapp.h

src/CMakeLists.txt

src/external_spinner.cpp

src/external_spinner.h

src/main.cpp

src/powerd_mediator.cpp

src/powerd_mediator.h

src/system_compositor.cpp

src/system_compositor.h

tests/CMakeLists.txt

tests/unit-tests/CMakeLists.txt

tests/unit-tests/test_session_switcher.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

spinner/CMakeLists.txt

spinner/eglapp.cpp

spinner/eglapp.h

spinner/eglspinner.cpp

spinner/miregl.cpp

spinner/miregl.h

src/CMakeLists.txt

src/com.canonical.Unity.Screen.xml

src/dbus_connection_handle.cpp

src/dbus_connection_handle.h

src/dbus_event_loop.cpp

src/dbus_event_loop.h

src/dbus_message_handle.cpp

src/dbus_message_handle.h

src/dbus_screen.cpp

src/dbus_screen.h

src/external_spinner.cpp

src/external_spinner.h

src/generate_header_with_string_from_file.sh

src/mir_screen.cpp

src/mir_screen.h

src/powerd_mediator.cpp

src/powerd_mediator.h

src/scoped_dbus_error.h

src/screen_event_handler.cpp

src/screen_event_handler.h

src/screen_hardware.h

src/session_coordinator.cpp

src/session_coordinator.h

src/surface_coordinator.cpp

src/surface_coordinator.h

src/system_compositor.cpp

src/system_compositor.h

src/thread_name.cpp

src/thread_name.h

src/unity_screen_service.cpp

src/unity_screen_service.h

src/window_manager.cpp

src/window_manager.h

src/worker_thread.cpp

src/worker_thread.h

tests/CMakeLists.txt

tests/integration-tests/

tests/integration-tests/CMakeLists.txt

tests/integration-tests/dbus_bus.cpp

tests/integration-tests/dbus_bus.h

tests/integration-tests/dbus_client.cpp

tests/integration-tests/dbus_client.h

tests/integration-tests/run_command.cpp

tests/integration-tests/run_command.h

tests/integration-tests/test_dbus_event_loop.cpp

tests/integration-tests/test_external_spinner.cpp

tests/integration-tests/test_powerd_mediator.cpp

tests/integration-tests/test_unity_screen_service.cpp

tests/integration-tests/usc_test_helper_wait_for_signal.c

tests/integration-tests/wait_condition.h

tests/unit-tests/CMakeLists.txt

tests/unit-tests/advanceable_timer.cpp

tests/unit-tests/advanceable_timer.h

tests/unit-tests/fake_shared.h

tests/unit-tests/test_mir_screen.cpp

tests/unit-tests/test_screen_event_handler.cpp

tests/unit-tests/test_session_switcher.cpp

Older »