← Back to branch summary

~jhodapp/media-hub/mh3-fix-manual-eos

~jhodapp/media-hub/mh3-fix-manual-eos

Viewing all changes in revision 115.

Committer: Jim Hodapp
Date: 2015-03-04 21:04:56 UTC
mfrom: (98.6.14 introduce-power-controller-interface)
Revision ID: jim.hodapp@canonical.com-20150304210456-1703dplu0pltrsub

Merge

files added:
src/core/media/external_services.h

src/core/media/power

src/core/media/power/state_controller.cpp

src/core/media/power/state_controller.h

files removed:
src/core/media/powerd_service.h

src/core/media/unity_screen_service.h

files modified:
src/core/media/CMakeLists.txt

src/core/media/player_implementation.cpp

src/core/media/player_implementation.h

src/core/media/server/server.cpp

src/core/media/service_implementation.cpp

src/core/media/service_implementation.h

tests/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

src/core/media/CMakeLists.txt

src/core/media/external_services.h

src/core/media/player_implementation.cpp

src/core/media/player_implementation.h

src/core/media/power/

src/core/media/power/state_controller.cpp

src/core/media/power/state_controller.h

src/core/media/powerd_service.h

src/core/media/server/server.cpp

src/core/media/service_implementation.cpp

src/core/media/service_implementation.h

src/core/media/unity_screen_service.h

tests/CMakeLists.txt

Older »