« back to all changes in this revision
Viewing changes to plugins/flight-mode/flight-mode.settings
- Committer: Michael Terry
- Date: 2014-02-13 15:27:47 UTC
- mfrom: (485.1.129 ubuntu-system-settings)
- Revision ID: michael.terry@canonical.com-20140213152747-dwu4r5z4o5zesqvd
Merge from trunk
- files added:
- plugins/brightness/PageComponent.qml
- plugins/brightness/plugin
- plugins/system-update/images
- plugins/system-update/plugin
- tests/plugins/system-update
- files renamed:
- plugins/system-update/Download.qml => plugins/system-update/Configuration.qml
- plugins/system-update/distributor-logo.png => plugins/system-update/images/distributor-logo.png
- plugins/system-update/settings-system-update.svg => plugins/system-update/images/settings-system-update.svg
- ubuntu-system-settings.desktop => ubuntu-system-settings.desktop.in
- files modified:
- .bzrignore
added
removed
plugins/flight-mode/flight-mode.settings
