Viewing all changes in revision 1156.
- Committer: Gerry Boland
- Date: 2014-12-09 12:55:58 UTC
- mfrom: (1139.1.343 unity8)
- Revision ID: gerry.boland@canonical.com-20141209125558-d68labgupwxfz91r
Merge trunk
- files added:
- plugins/Wizard
- qml/Wizard
- qml/Wizard/Pages
- qml/Wizard/Pages/data
- tests/mocks/MeeGo
- tests/mocks/MeeGo/QOfono
- tests/mocks/Ubuntu/SystemSettings
- tests/mocks/Ubuntu/SystemSettings/LanguagePlugin
- tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy
- tests/mocks/Wizard
- tests/plugins/Wizard
- tests/qmltests/Wizard
- tests/qmltests/Wizard/licenses
- tests/qmltests/Wizard/nolicenses
- files removed:
- qml/Dash/ScopesOverview.qml
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
qml/Wizard/Pages/data/meet_ubuntu_simcard@30.png
