Viewing all changes in revision 804.
- Committer: Roberto Alsina
- Date: 2014-07-31 18:32:54 UTC
- mfrom: (779.1.70 ubuntu-system-settings)
- Revision ID: roberto.alsina@canonical.com-20140731183254-0dgi0dfspshtolbb
merged trunk
- files added:
- debian/ubuntu-system-settings.maintscript
- plugins/background/Components
- plugins/cellular/Components
- tests/autopilot/ubuntu_system_settings/background_images
- files removed:
- debian/ubuntu-system-settings.dirs
- wizard/qml/Components/data
- files renamed:
- plugins/background/OverlayImage.qml => plugins/background/Components/OverlayImage.qml
- plugins/cellular/ChooseCarrier.qml => plugins/cellular/PageChooseCarrier.qml
- tests/test_code.py => tests/test_code.py.in
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
plugins/background/Components/selected-overlay.png
plugins/background/bullet.png
plugins/background/header_handlearrow.png
plugins/background/header_handlearrow2.png
tests/autopilot/ubuntu_system_settings/background_images/cakes.jpg
tests/autopilot/ubuntu_system_settings/background_images/launchpad.jpg
tests/autopilot/ubuntu_system_settings/background_images/redtrain.jpg
tests/autopilot/ubuntu_system_settings/background_images/spaceman.jpg
wizard/qml/Components/data/bullet_active@27.png
wizard/qml/Components/data/bullet_inactive@27.png
