← Back to branch summary

~laney/ubuntu-system-settings/datetime-picker

~laney/ubuntu-system-settings/datetime-picker

Viewing all changes in revision 593.

Committer: Iain Lane
Date: 2014-02-12 17:06:43 UTC
mfrom: (592.1.21 ubuntu-system-settings)
Revision ID: iain.lane@canonical.com-20140212170643-tgs0rz67ygc25dp7

Merge trunk

files added:
plugins/brightness/PageComponent.qml

plugins/brightness/brightness.cpp

plugins/brightness/brightness.h

plugins/brightness/plugin

plugins/brightness/plugin.cpp

plugins/brightness/plugin.h

plugins/brightness/plugin/CMakeLists.txt

plugins/brightness/plugin/brightness-plugin.cpp

plugins/brightness/plugin/brightness-plugin.h

plugins/brightness/qmldir

plugins/system-update/EntryComponent.qml

plugins/system-update/plugin

plugins/system-update/plugin/CMakeLists.txt

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

plugins/system-update/plugin/update-plugin.h

plugins/system-update/update-notification.settings

po/ckb.po

src/SystemSettings/BrightnessSlider.qml

tests/autopilot/ubuntu_system_settings/tests/test_datetime.py

files removed:
plugins/security-privacy/com.ubuntu.touch.AccountsService.SecurityPrivacy.xml

files modified:
debian/changelog

debian/control

debian/ubuntu-system-settings.install

plugins/battery/PageComponent.qml

plugins/brightness/CMakeLists.txt

plugins/brightness/brightness.settings

plugins/security-privacy/CMakeLists.txt

plugins/system-update/CMakeLists.txt

plugins/system-update/PageComponent.qml

plugins/system-update/update_manager.cpp

plugins/time-date/ChooseTimeZone.qml

plugins/time-date/PageComponent.qml

plugins/time-date/timedate.cpp

po/ar.po

po/ast.po

po/be.po

po/bg.po

po/bs.po

po/ca.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/sv.po

po/ta.po

po/te.po

po/tr.po

po/ubuntu-system-settings.pot

po/ug.po

po/uk.po

po/xh.po

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

src/SystemSettings/CMakeLists.txt

src/SystemSettings/qmldir

src/qml/MainWindow.qml

tests/autopilot/ubuntu_system_settings/tests/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py

tests/plugins/system-update/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/ubuntu-system-settings.install

plugins/battery/PageComponent.qml

plugins/brightness/CMakeLists.txt

plugins/brightness/PageComponent.qml

plugins/brightness/brightness.cpp

plugins/brightness/brightness.h

plugins/brightness/brightness.settings

plugins/brightness/plugin.cpp

plugins/brightness/plugin.h

plugins/brightness/plugin/

plugins/brightness/plugin/CMakeLists.txt

plugins/brightness/plugin/brightness-plugin.cpp

plugins/brightness/plugin/brightness-plugin.h

plugins/brightness/qmldir

plugins/security-privacy/CMakeLists.txt

plugins/security-privacy/com.ubuntu.touch.AccountsService.SecurityPrivacy.xml

plugins/system-update/CMakeLists.txt

plugins/system-update/EntryComponent.qml

plugins/system-update/PageComponent.qml

plugins/system-update/plugin/

plugins/system-update/plugin/CMakeLists.txt

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

plugins/system-update/plugin/update-plugin.h

plugins/system-update/update-notification.settings

plugins/system-update/update_manager.cpp

plugins/time-date/ChooseTimeZone.qml

plugins/time-date/PageComponent.qml

plugins/time-date/timedate.cpp

po/ubuntu-system-settings.pot

src/SystemSettings/BrightnessSlider.qml

src/SystemSettings/CMakeLists.txt

src/SystemSettings/qmldir

src/qml/MainWindow.qml

tests/autopilot/ubuntu_system_settings/tests/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_datetime.py

tests/autopilot/ubuntu_system_settings/tests/test_system_updates.py

tests/plugins/system-update/CMakeLists.txt

Older »