← Back to branch summary

~phablet-team/media-hub/use-transact-method

~phablet-team/media-hub/use-transact-method

Viewing all changes in revision 123.

Committer: Ricardo Mendoza
Date: 2015-03-16 14:37:29 UTC
mfrom: (98.10.14 introduce-apparmor-interfaces)
Revision ID: ricardo.mendoza@canonical.com-20150316143729-p7cz2zoiws90hug0

Merge lp:~phablet-team/media-hub/introduce-apparmor-interfaces

files added:
src/core/media/apparmor

src/core/media/apparmor/context.cpp

src/core/media/apparmor/context.h

src/core/media/apparmor/dbus.h

src/core/media/apparmor/ubuntu.cpp

src/core/media/apparmor/ubuntu.h

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

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

src/core/media/player.cpp

src/core/media/player_configuration.h

src/core/media/player_implementation.cpp

src/core/media/player_implementation.h

src/core/media/player_skeleton.cpp

src/core/media/player_skeleton.h

src/core/media/service_implementation.cpp

src/core/media/service_skeleton.cpp

Show diffs side-by-side

added added

removed removed

src/core/media/CMakeLists.txt

src/core/media/apparmor.h

src/core/media/apparmor/

src/core/media/apparmor/context.cpp

src/core/media/apparmor/context.h

src/core/media/apparmor/dbus.h

src/core/media/apparmor/ubuntu.cpp

src/core/media/apparmor/ubuntu.h

src/core/media/player.cpp

src/core/media/player_configuration.h

src/core/media/player_implementation.cpp

src/core/media/player_implementation.h

src/core/media/player_skeleton.cpp

src/core/media/player_skeleton.h

src/core/media/service_implementation.cpp

src/core/media/service_skeleton.cpp

Older »