Viewing all changes in revision 911.
- Committer: Iain Lane
- Date: 2014-09-12 15:42:58 UTC
- mfrom: (909.1.129 ubuntu-system-settings)
- Revision ID: iain.lane@canonical.com-20140912154258-us1z04wfps2zpw2t
Merge trunk
- files added:
- plugins/about/PhoneNumber.qml
- files removed:
- plugins/cellular/Components/data-helpers.js
- files renamed:
- plugins/cellular/Components/CellularDualSim.qml => plugins/cellular/Components/CellularMultiSim.qml
- ubuntu-system-settings.desktop.in => ubuntu-system-settings.desktop.in.in
- wizard/qml/Components/ForwardButton.qml => wizard/qml/Components/StackButton.qml
- wizard/qml/Pages/30-location.qml => wizard/qml/Pages/40-reporting.qml
- files modified:
- CMakeLists.txt
- debian/ubuntu-system-settings-sound-gsettings-to-accountsservice.py *
expand all
collapse all
added
removed
