← Back to branch summary

~jonas-drange/ubuntu-system-settings/call-fwd-wait-dual-sim

~jonas-drange/ubuntu-system-settings/call-fwd-wait-dual-sim

Viewing all changes in revision 884.

Committer: jonas-drange
Date: 2014-08-23 00:13:03 UTC
mfrom: (862.1.71 ubuntu-system-settings)
Revision ID: jonas.drange@canonical.com-20140823001303-jh2y34vhnxjzycai

merge trunk

files added:
wizard/qml/Components/CheckableSetting.qml

wizard/qml/Pages/30-location.qml

wizard/qml/Pages/data/HEREposconsent_da-DK.html

wizard/qml/Pages/data/HEREposconsent_de-DE.html

wizard/qml/Pages/data/HEREposconsent_en-GB.html

wizard/qml/Pages/data/HEREposconsent_en-US.html

wizard/qml/Pages/data/HEREposconsent_es-ES.html

wizard/qml/Pages/data/HEREposconsent_es-MX.html

wizard/qml/Pages/data/HEREposconsent_fr-FR.html

wizard/qml/Pages/data/HEREposconsent_it-IT.html

wizard/qml/Pages/data/HEREposconsent_ja-JP.html

wizard/qml/Pages/data/HEREposconsent_ko-KR.html

wizard/qml/Pages/data/HEREposconsent_nl-NL.html

wizard/qml/Pages/data/HEREposconsent_pl-PL.html

wizard/qml/Pages/data/HEREposconsent_pt-BR.html

wizard/qml/Pages/data/HEREposconsent_pt-PT.html

wizard/qml/Pages/data/HEREposconsent_ru-RU.html

wizard/qml/Pages/data/HEREposconsent_sv-SE.html

wizard/qml/Pages/data/HEREposconsent_zh-CN.html

wizard/qml/Pages/data/HEREposconsent_zh-TW.html

wizard/qml/Pages/terms.qml

files renamed:
wizard/qml/Pages/30-location.qml => wizard/qml/Pages/40-reporting.qml

files modified:
debian/changelog

debian/control

plugins/about/storageabout.cpp

plugins/battery/PageComponent.qml

plugins/battery/SleepValues.qml

plugins/battery/battery.cpp

plugins/bluetooth/PageComponent.qml

plugins/bluetooth/agent.h

plugins/bluetooth/bluetooth.cpp

plugins/bluetooth/bluetooth.h

plugins/bluetooth/device.cpp

plugins/cellular/Components/SingleSim.qml

plugins/notifications/notification_item.cpp

plugins/security-privacy/LockSecurity.qml

plugins/security-privacy/PageComponent.qml

plugins/security-privacy/PhoneLocking.qml

plugins/security-privacy/trust-store-model.cpp

plugins/system-update/update_manager.cpp

plugins/time-date/timezonelocationmodel.cpp

src/i18n.cpp

src/plugin-manager.cpp

src/plugin.cpp

tests/plugins/bluetooth/tst_bluetooth.cpp

tests/plugins/bluetooth/tst_devicemodel.cpp

tests/plugins/system-update/tst_update.cpp

tests/plugins/system-update/tst_updatemanager.cpp

tests/test-plugin2.cpp

tests/tst_arguments.cpp

tests/tst_plugins.cpp

wizard/qml/Components/Page.qml

wizard/qml/Pages/80-finished.qml

wizard/qml/Pages/no-sim.qml

wizard/qml/main.qml

Show diffs side-by-side

added added

removed removed

debian/changelog

plugins/about/storageabout.cpp

plugins/battery/PageComponent.qml

plugins/battery/SleepValues.qml

plugins/battery/battery.cpp

plugins/bluetooth/PageComponent.qml

plugins/bluetooth/agent.h

plugins/bluetooth/bluetooth.cpp

plugins/bluetooth/bluetooth.h

plugins/bluetooth/device.cpp

plugins/cellular/Components/SingleSim.qml

plugins/notifications/notification_item.cpp

plugins/security-privacy/LockSecurity.qml

plugins/security-privacy/PageComponent.qml

plugins/security-privacy/PhoneLocking.qml

plugins/security-privacy/trust-store-model.cpp

plugins/system-update/update_manager.cpp

plugins/time-date/timezonelocationmodel.cpp

src/plugin-manager.cpp

tests/plugins/bluetooth/tst_bluetooth.cpp

tests/plugins/bluetooth/tst_devicemodel.cpp

tests/plugins/system-update/tst_update.cpp

tests/plugins/system-update/tst_updatemanager.cpp

tests/test-plugin2.cpp

tests/tst_arguments.cpp

tests/tst_plugins.cpp

wizard/qml/Components/CheckableSetting.qml

wizard/qml/Components/Page.qml

wizard/qml/Pages/30-location.qml

wizard/qml/Pages/40-reporting.qml

wizard/qml/Pages/80-finished.qml

wizard/qml/Pages/data/HEREposconsent_da-DK.html

wizard/qml/Pages/data/HEREposconsent_de-DE.html

wizard/qml/Pages/data/HEREposconsent_en-GB.html

wizard/qml/Pages/data/HEREposconsent_en-US.html

wizard/qml/Pages/data/HEREposconsent_es-ES.html

wizard/qml/Pages/data/HEREposconsent_es-MX.html

wizard/qml/Pages/data/HEREposconsent_fr-FR.html

wizard/qml/Pages/data/HEREposconsent_it-IT.html

wizard/qml/Pages/data/HEREposconsent_ja-JP.html

wizard/qml/Pages/data/HEREposconsent_ko-KR.html

wizard/qml/Pages/data/HEREposconsent_nl-NL.html

wizard/qml/Pages/data/HEREposconsent_pl-PL.html

wizard/qml/Pages/data/HEREposconsent_pt-BR.html

wizard/qml/Pages/data/HEREposconsent_pt-PT.html

wizard/qml/Pages/data/HEREposconsent_ru-RU.html

wizard/qml/Pages/data/HEREposconsent_sv-SE.html

wizard/qml/Pages/data/HEREposconsent_zh-CN.html

wizard/qml/Pages/data/HEREposconsent_zh-TW.html

wizard/qml/Pages/no-sim.qml

wizard/qml/Pages/terms.qml

wizard/qml/main.qml

Older »