← Back to branch summary

~om26er/ubuntu-system-settings/add_ringtone_test

~om26er/ubuntu-system-settings/add_ringtone_test

Viewing all changes in revision 725.

Committer: Omer Akram
Date: 2014-06-23 12:06:02 UTC
mfrom: (708.2.35 ubuntu-system-settings)
Revision ID: om26er@ubuntu.com-20140623120602-aduvx52fb0qg2e33

merge trunk

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

debian/ubuntu-system-settings.postrm

po/sa.po

po/si.po

tests/autopilot/ubuntu_system_settings/tests/test_sound.py

wizard/50-com.ubuntu.system-settings.wizard.pkla

wizard/Unity/Application/CMakeLists.txt

wizard/Unity/CMakeLists.txt

wizard/Utils

wizard/Utils/CMakeLists.txt

wizard/Utils/plugin.cpp

wizard/Utils/plugin.h

wizard/Utils/qmldir

wizard/Utils/qsortfilterproxymodelqml.cpp

wizard/Utils/qsortfilterproxymodelqml.h

wizard/qml/Components/SectionHeader.qml

wizard/ubuntu-system-settings-wizard-cleanup.conf

files removed:
tests/mocks

wizard/qml/Pages/20-wifi.qml.disabled

wizard/qml/Pages/spinner.qml

files renamed:
tests/mocks/Unity/ => wizard/Unity/

files modified:
debian/changelog

debian/control

debian/rules

debian/ubuntu-system-settings.install

plugins/background/MainPage.qml

plugins/background/background.cpp

plugins/background/background.h

plugins/background/utilities.js

plugins/bluetooth/PageComponent.qml

plugins/bluetooth/bluetooth.cpp

plugins/bluetooth/bluetooth.h

plugins/bluetooth/device.cpp

plugins/bluetooth/device.h

plugins/bluetooth/devicemodel.cpp

plugins/bluetooth/devicemodel.h

plugins/security-privacy/diagnostics/diagnostics.cpp

plugins/sound/PageComponent.qml

plugins/time-date/ChooseTimeZone.qml

plugins/time-date/timedate.cpp

plugins/time-date/timedate.h

plugins/time-date/timezonelocationmodel.cpp

plugins/time-date/timezonelocationmodel.h

po/ca.po

po/en_GB.po

po/fr.po

po/lv.po

po/sv.po

po/ug.po

tests/autopilot/ubuntu_system_settings/tests/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_datetime.py

tests/tst_pagelist.cpp

wizard/CMakeLists.txt

wizard/PageList.cpp

wizard/main.cpp

wizard/qml/Pages/20-wifi.qml

wizard/qml/Pages/80-finished.qml

wizard/qml/main.qml

wizard/ubuntu-system-settings-wizard.conf

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/ubuntu-system-settings-wizard.install

debian/ubuntu-system-settings.install

debian/ubuntu-system-settings.postrm

plugins/background/MainPage.qml

plugins/background/background.cpp

plugins/background/background.h

plugins/background/utilities.js

plugins/bluetooth/PageComponent.qml

plugins/bluetooth/bluetooth.cpp

plugins/bluetooth/bluetooth.h

plugins/bluetooth/device.cpp

plugins/bluetooth/device.h

plugins/bluetooth/devicemodel.cpp

plugins/bluetooth/devicemodel.h

plugins/security-privacy/diagnostics/diagnostics.cpp

plugins/sound/PageComponent.qml

plugins/time-date/ChooseTimeZone.qml

plugins/time-date/timedate.cpp

plugins/time-date/timedate.h

plugins/time-date/timezonelocationmodel.cpp

plugins/time-date/timezonelocationmodel.h

tests/autopilot/ubuntu_system_settings/tests/__init__.py

tests/autopilot/ubuntu_system_settings/tests/test_datetime.py

tests/autopilot/ubuntu_system_settings/tests/test_sound.py

tests/tst_pagelist.cpp

wizard/50-com.ubuntu.system-settings.wizard.pkla

wizard/CMakeLists.txt

wizard/PageList.cpp

wizard/Unity/Application/CMakeLists.txt

wizard/Unity/CMakeLists.txt

wizard/Utils/CMakeLists.txt

wizard/Utils/plugin.cpp

wizard/Utils/plugin.h

wizard/Utils/qmldir

wizard/Utils/qsortfilterproxymodelqml.cpp

wizard/Utils/qsortfilterproxymodelqml.h

wizard/main.cpp

wizard/qml/Components/SectionHeader.qml

wizard/qml/Pages/20-wifi.qml

wizard/qml/Pages/20-wifi.qml.disabled

wizard/qml/Pages/80-finished.qml

wizard/qml/Pages/spinner.qml

wizard/qml/main.qml

wizard/ubuntu-system-settings-wizard-cleanup.conf

wizard/ubuntu-system-settings-wizard.conf

Older »