Viewing all changes in revision 1435.
- Committer: Ying-Chun Liu
- Date: 2015-02-13 13:27:19 UTC
- mfrom: (1431.1.180 unity8)
- Revision ID: paul.liu@canonical.com-20150213132719-8itxhrauv317p18p
Merge trunk
- files added:
- com.canonical.Unity8.gschema.xml
- plugins/Greeter
- plugins/Greeter/Unity
- plugins/Greeter/Unity/Launcher
- plugins/LightDM/liblightdm
- plugins/Wizard
- qml/Components/PanelState
- qml/Tutorial
- qml/Tutorial/graphics
- qml/Wizard
- qml/Wizard/Pages
- qml/Wizard/Pages/data
- tests/mocks/LightDM/liblightdm
- 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/Greeter
- tests/plugins/Greeter/Unity
- tests/plugins/Greeter/Unity/Launcher
- tests/plugins/Wizard
- tests/qmltests/Tutorial
- tests/qmltests/Wizard
- tests/qmltests/Wizard/licenses
- tests/qmltests/Wizard/nolicenses
- files removed:
- plugins/Unity/Indicators/visibleindicatorsmodel.cpp
- tests/mocks/LightDM/QLightDM/Greeter
- tests/mocks/LightDM/QLightDM/InfographicModel
- tests/mocks/LightDM/QLightDM/UsersModel
- tests/mocks/LightDM/demo
- tests/mocks/LightDM/full
- tests/mocks/LightDM/single
- tests/mocks/LightDM/single-passphrase
- tests/mocks/LightDM/single-pin
- 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/LightDM/Greeter.cpp => tests/mocks/LightDM/liblightdm/Greeter.cpp
- tests/mocks/LightDM/Greeter.h => tests/mocks/LightDM/liblightdm/Greeter.h
- tests/mocks/LightDM/GreeterPrivate.h => tests/mocks/LightDM/liblightdm/GreeterPrivate.h
- tests/mocks/LightDM/UsersModel.cpp => tests/mocks/LightDM/liblightdm/UsersModel.cpp
- tests/mocks/LightDM/UsersModel.h => tests/mocks/LightDM/liblightdm/UsersModel.h
- tests/mocks/LightDM/UsersModelPrivate.h => tests/mocks/LightDM/liblightdm/UsersModelPrivate.h
- tests/mocks/Unity/Indicators/RootActionState.qml => tests/mocks/Unity/Indicators/ModelActionRootState.qml
- tests/mocks/Unity/Notifications/MockNotificationTypes.cpp => tests/mocks/Unity/Notifications/MockNotification.cpp
- tests/mocks/Unity/Notifications/MockNotificationTypes.h => tests/mocks/Unity/Notifications/MockNotification.h
- tests/plugins/Utils/qsortfilterproxymodeltest.cpp => tests/plugins/Utils/unitysortfilterproxymodeltest.cpp
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
qml/Tutorial/graphics/camera.png
qml/Tutorial/graphics/chevron.png
qml/Tutorial/graphics/dialer.png
qml/Tutorial/graphics/facebook.png
qml/Tutorial/graphics/gallery.png
qml/Tutorial/graphics/tick.png
qml/Wizard/Pages/data/meet_ubuntu_simcard@30.png
