← Back to branch summary

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

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

Viewing all changes in revision 122.

Committer: Ricardo Mendoza
Date: 2015-03-16 14:37:24 UTC
mfrom: (98.9.12 introduce-call-monitor-interface)
Revision ID: ricardo.mendoza@canonical.com-20150316143724-7fyv1bvxu1rupky4

Merge lp:~phablet-team/media-hub/introduce-call-monitor-interface

files renamed:
src/core/media/call-monitor/ => src/core/media/telephony/

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

src/core/media/service_implementation.cpp

src/core/media/telephony/call_monitor.cpp

src/core/media/telephony/call_monitor.h

Show diffs side-by-side

added added

removed removed

src/core/media/CMakeLists.txt

src/core/media/service_implementation.cpp

src/core/media/telephony/call_monitor.cpp

src/core/media/telephony/call_monitor.h

Older »