~charlesk/indicator-location/use-properties-cpp

Viewing all changes in revision 119.

Committer: Loïc Minier
Date: 2014-09-03 22:42:59 UTC
mfrom: (117.1.20 trunk)
Revision ID: loic.minier@ubuntu.com-20140903224259-lupytswl8n82sil9

Tags: 13.10.0+14.10.20140902.7-0ubuntu1

Manually merge lp:~pete-woods/indicator-location/here-licence and sync with CI
Train generated PPA upload.

[ Pete Woods ]
* Add here licence action (new dependency on libUAL)
[ CI bot ]
* Resync trunk

files added:
src/accounts-service-license-controller.cc

src/accounts-service-license-controller.h

src/license-controller.cc

src/license-controller.h

src/mock-license-controller.h

files removed:
po/id.po

files modified:
CMakeLists.txt

debian/changelog

debian/control

po/indicator-location.pot

src/CMakeLists.txt

src/main.cc

src/phone.cc

src/phone.h

src/service.cc

src/service.h

src/utils.h

tests/phone-test.cc

expand all

Show diffs side-by-side

added added

removed removed

po/indicator-location.pot

src/CMakeLists.txt

src/accounts-service-license-controller.cc

src/accounts-service-license-controller.h

src/license-controller.cc

src/license-controller.h

src/main.cc

src/mock-license-controller.h

Older »