← Back to branch summary

~phablet-team/platform-api/mir-packaging

~phablet-team/platform-api/mir-packaging

Viewing all changes in revision 89.

Committer: gerboland
Date: 2013-08-05 13:06:24 UTC
mfrom: (70.22.15 trunk)
Revision ID: gerry.boland@canonical.com-20130805130624-danperw2ap1i3uz0

Merge lp:platform-api trunk and update packaging dependencies to require libmirserver1

files modified:
android/hybris/Android.mk

android/hybris/default_application_manager.cpp

android/hybris/default_application_manager_test.cpp

android/hybris/ubuntu_application_api_for_hybris.cpp

android/include/private/ui/well_known_applications.h

debian/changelog

debian/control

include/ubuntu/application/archive.h

include/ubuntu/ui/ubuntu_ui_session_service.h

Show diffs side-by-side

added added

removed removed

android/hybris/Android.mk

android/hybris/default_application_manager.cpp

android/hybris/default_application_manager_test.cpp

android/hybris/ubuntu_application_api_for_hybris.cpp

android/include/private/ui/well_known_applications.h

debian/changelog

include/ubuntu/application/archive.h

include/ubuntu/ui/ubuntu_ui_session_service.h

Older »