Viewing all changes in revision 1521.
- Committer: Federico Gimenez
- Date: 2015-04-15 08:30:29 UTC
- mfrom: (1519.1.211 unity8)
- Revision ID: fgimenez@canonical.com-20150415083029-u9dddn6nux46c6ne
Merged with trunk
- files added:
- data/indicators-client.desktop.in
- plugins/Greeter
- plugins/Greeter/Unity
- plugins/Greeter/Unity/Launcher
- plugins/LightDM/liblightdm
- qml/Tutorial
- qml/Tutorial/graphics
- tests/autopilot/unity8/greeter
- tests/autopilot/unity8/greeter/tests
- tests/mocks/LightDM/liblightdm
- tests/mocks/Lights
- tests/mocks/data/unity
- tests/mocks/data/unity/indicators
- tests/mocks/indicator-service
- tests/plugins/Greeter
- tests/plugins/Greeter/Unity
- tests/plugins/Greeter/Unity/Launcher
- tests/qmltests/Tutorial
- 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:
- com.canonical.Unity8.gschema.xml => data/com.canonical.Unity8.gschema.xml
- 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/Greeter/GreeterContent.qml => qml/Greeter/CoverPage.qml
- 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/Notifications/grip-large.svg
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
