Viewing all changes in revision 1464.
- Committer: Michael Zanetti
- Date: 2015-01-12 11:21:17 UTC
- mfrom: (1459.1.85 unity8)
- Revision ID: michael.zanetti@canonical.com-20150112112117-0x9srs9dx0ndp60g
merge trunk
- files added:
- com.canonical.Unity8.gschema.xml
- plugins/Wizard
- qml/Components/PanelState
- qml/Wizard
- qml/Wizard/Pages
- qml/Wizard/Pages/data
- tests/mocks/Lights
- 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 renamed:
- plugins/Unity/Indicators/rootactionstate.cpp => plugins/Unity/Indicators/rootstateparser.cpp
- plugins/Unity/Indicators/rootactionstate.h => plugins/Unity/Indicators/rootstateparser.h
- plugins/Utils/qsortfilterproxymodelqml.cpp => plugins/Utils/unitysortfilterproxymodelqml.cpp
- plugins/Utils/qsortfilterproxymodelqml.h => plugins/Utils/unitysortfilterproxymodelqml.h
- qml/graphics/applicationIcons/dash@18.png => qml/graphics/applicationIcons/dash.png
- tests/mocks/Unity/Indicators/RootActionState.qml => tests/mocks/Unity/Indicators/ModelActionRootState.qml
- tests/plugins/Utils/qsortfilterproxymodeltest.cpp => tests/plugins/Utils/unitysortfilterproxymodeltest.cpp
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
qml/Wizard/Pages/data/meet_ubuntu_simcard@30.png
