← Back to branch summary

~mterry/+junk/wizard

~mterry/+junk/wizard

Viewing all changes in revision 719.

Committer: Michael Terry
Date: 2014-06-11 13:42:15 UTC
mfrom: (662.1.68 ubuntu-system-settings)
Revision ID: michael.terry@canonical.com-20140611134215-6277k4d152d2h8or

Merge from trunk

files added:
debian/ubuntu-system-settings.postrm

po/gd.po

po/lt.po

po/pa.po

files removed:
tests/autopilot/ubuntu_system_settings/__init__.py

files renamed:
tests/autopilot/ubuntu_system_settings/helpers.py => tests/autopilot/ubuntu_system_settings/__init__.py

files modified:
CMakeLists.txt

debian/changelog

debian/control

plugins/background/MainPage.qml

plugins/background/background.cpp

plugins/background/background.h

plugins/background/utilities.js

plugins/brightness/brightness.cpp

plugins/cellular/PageComponent.qml

plugins/system-update/EntryComponent.qml

plugins/system-update/PageComponent.qml

plugins/system-update/plugin/CMakeLists.txt

plugins/system-update/plugin/update-plugin.cpp

plugins/system-update/system_update.cpp

plugins/system-update/system_update.h

plugins/system-update/update.cpp

plugins/system-update/update.h

plugins/system-update/update_manager.cpp

plugins/system-update/update_manager.h

plugins/time-date/CMakeLists.txt

plugins/time-date/timedate.cpp

plugins/time-date/timedate.h

plugins/time-date/timezonelocationmodel.cpp

plugins/time-date/timezonelocationmodel.h

po/ar.po

po/ast.po

po/az.po

po/be.po

po/bg.po

po/br.po

po/bs.po

po/ca.po

po/ckb.po

po/cs.po

po/da.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/eo.po

po/es.po

po/fa.po

po/fi.po

po/fr.po

po/gl.po

po/gu.po

po/he.po

po/hi.po

po/hr.po

po/hu.po

po/id.po

po/is.po

po/it.po

po/ja.po

po/km.po

po/ko.po

po/lo.po

po/lv.po

po/ms.po

po/my.po

po/nb.po

po/nl.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ru.po

po/shn.po

po/sl.po

po/sr.po

po/st.po

po/sv.po

po/ta.po

po/te.po

po/tr.po

po/ug.po

po/uk.po

po/xh.po

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

src/qml/MainWindow.qml

tests/autopilot/ubuntu_system_settings/tests/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_about.py

tests/autopilot/ubuntu_system_settings/tests/test_cellular.py

tests/autopilot/ubuntu_system_settings/tests/test_datetime.py

tests/autopilot/ubuntu_system_settings/tests/test_plugins.py

tests/autopilot/ubuntu_system_settings/tests/test_search.py

tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py

tests/plugins/system-update/fakessoservice.cpp

tests/plugins/system-update/fakessoservice.h

tests/plugins/system-update/fakesystemupdate.h

tests/plugins/system-update/tst_updatemanager.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/ubuntu-system-settings.postrm

plugins/background/MainPage.qml

plugins/background/background.cpp

plugins/background/background.h

plugins/background/utilities.js

plugins/brightness/brightness.cpp

plugins/cellular/PageComponent.qml

plugins/system-update/EntryComponent.qml

plugins/system-update/PageComponent.qml

plugins/system-update/plugin/CMakeLists.txt

plugins/system-update/plugin/update-plugin.cpp

plugins/system-update/system_update.cpp

plugins/system-update/system_update.h

plugins/system-update/update.cpp

plugins/system-update/update.h

plugins/system-update/update_manager.cpp

plugins/system-update/update_manager.h

plugins/time-date/CMakeLists.txt

plugins/time-date/timedate.cpp

plugins/time-date/timedate.h

plugins/time-date/timezonelocationmodel.cpp

plugins/time-date/timezonelocationmodel.h

src/qml/MainWindow.qml

tests/autopilot/ubuntu_system_settings/__init__.py

tests/autopilot/ubuntu_system_settings/__init__.py

tests/autopilot/ubuntu_system_settings/tests/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_about.py

tests/autopilot/ubuntu_system_settings/tests/test_cellular.py

tests/autopilot/ubuntu_system_settings/tests/test_datetime.py

tests/autopilot/ubuntu_system_settings/tests/test_plugins.py

tests/autopilot/ubuntu_system_settings/tests/test_search.py

tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py

tests/plugins/system-update/fakessoservice.cpp

tests/plugins/system-update/fakessoservice.h

tests/plugins/system-update/fakesystemupdate.h

tests/plugins/system-update/tst_updatemanager.cpp

Older »