Viewing all changes in revision 983.
- Committer: Loïc Minier
- Date: 2014-09-03 22:39:50 UTC
- mfrom: (965.1.2 here-fix)
- Revision ID: loic.minier@ubuntu.com-20140903223950-501wayowzfzsg2g9
Manually merge lp:~mterry/ubuntu-system-settings/here-fixes and resync with
citrain PPA upload.
[ Michael Terry ]
* Make the HERE license optional, clearly mark it as a HERE license
instead of an Ubuntu license, and connect it to the HERE backend.
[ CI bot ]
* Resync trunk
[ Martin Pitt ]
* POT update
citrain PPA upload.
[ Michael Terry ]
* Make the HERE license optional, clearly mark it as a HERE license
instead of an Ubuntu license, and connect it to the HERE backend.
[ CI bot ]
* Resync trunk
[ Martin Pitt ]
* POT update
- files added:
- wizard/Utils/system.cpp
- files removed:
- wizard/qml/Pages/data/HEREposconsent_da-DK.html
- files modified:
- debian/changelog
- debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py *
expand all
collapse all
added
removed
