← Back to branch summary

~fginther/ubuntu-system-settings/jenkins-test

~fginther/ubuntu-system-settings/jenkins-test

Viewing all changes in revision 485.1.18.

Committer: Michael Terry
Date: 2013-12-31 19:30:03 UTC
mfrom: (541 ubuntu-system-settings)
mto: This revision was merged to the branch mainline in revision 635.
Revision ID: michael.terry@canonical.com-20131231193003-abubcbtvs6xw9mgv

Merge from trunk

files added:
debian/ubuntu-system-settings-autopilot.install

plugins/background/Preview.qml

plugins/background/WallpaperGrid.qml

plugins/background/Wallpapers.qml

plugins/background/import-image@18.png

plugins/background/utilities.js

tests/autopilot

tests/autopilot/setup.py

tests/autopilot/ubuntu_system_settings

tests/autopilot/ubuntu_system_settings/__init__.py

tests/autopilot/ubuntu_system_settings/tests

tests/autopilot/ubuntu_system_settings/tests/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_about.py

tests/autopilot/ubuntu_system_settings/tests/test_plugins.py

tests/autopilot/ubuntu_system_settings/tests/test_search.py

tests/autopilot/ubuntu_system_settings/utils

tests/autopilot/ubuntu_system_settings/utils/__init__.py

tests/autopilot/ubuntu_system_settings/utils/i18n.py

files modified:
CMakeLists.txt

debian/changelog

debian/control

debian/rules

plugins/about/EntryComponent.qml

plugins/about/License.qml

plugins/about/PageComponent.qml

plugins/about/Storage.qml

plugins/about/StorageItem.qml

plugins/background/CMakeLists.txt

plugins/background/MainPage.qml

plugins/background/OverlayImage.qml

plugins/background/SwappableImage.qml

plugins/background/background.cpp

plugins/background/background.h

plugins/battery/PageComponent.qml

plugins/battery/plugin/battery-plugin.cpp

plugins/language/CMakeLists.txt

plugins/language/language-plugin.cpp

plugins/language/language-plugin.h

po/CMakeLists.txt

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/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/CMakeLists.txt

src/main.cpp

src/plugin.cpp

src/plugin.h

src/qml/CategoryGrid.qml

src/qml/EntryComponent.qml

src/qml/MainWindow.qml

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/ubuntu-system-settings-autopilot.install

plugins/about/EntryComponent.qml

plugins/about/License.qml

plugins/about/PageComponent.qml

plugins/about/Storage.qml

plugins/about/StorageItem.qml

plugins/background/CMakeLists.txt

plugins/background/MainPage.qml

plugins/background/OverlayImage.qml

plugins/background/Preview.qml

plugins/background/SwappableImage.qml

plugins/background/WallpaperGrid.qml

plugins/background/Wallpapers.qml

plugins/background/background.cpp

plugins/background/background.h

plugins/background/import-image@18.png

plugins/background/utilities.js

plugins/battery/PageComponent.qml

plugins/battery/plugin/battery-plugin.cpp

plugins/language/CMakeLists.txt

plugins/language/language-plugin.cpp

plugins/language/language-plugin.h

po/CMakeLists.txt

po/ubuntu-system-settings.pot

src/CMakeLists.txt

src/qml/CategoryGrid.qml

src/qml/EntryComponent.qml

src/qml/MainWindow.qml

tests/autopilot/

tests/autopilot/setup.py

tests/autopilot/ubuntu_system_settings/

tests/autopilot/ubuntu_system_settings/__init__.py

tests/autopilot/ubuntu_system_settings/tests/

tests/autopilot/ubuntu_system_settings/tests/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_about.py

tests/autopilot/ubuntu_system_settings/tests/test_plugins.py

tests/autopilot/ubuntu_system_settings/tests/test_search.py

tests/autopilot/ubuntu_system_settings/utils/

tests/autopilot/ubuntu_system_settings/utils/__init__.py

tests/autopilot/ubuntu_system_settings/utils/i18n.py

Older »