Viewing all changes in revision 2533.
- Committer: Michael Zanetti
- Date: 2016-10-13 11:02:11 UTC
- mfrom: (2525.1.132 unity8)
- Revision ID: michael.zanetti@canonical.com-20161013110211-tj2gly2dxaqj5t2e
merge trunk
- files added:
- .crossbuilder
- plugins/ImageCache
- plugins/LightDM/FullLightDM
- plugins/LightDM/IntegratedLightDM
- plugins/LightDM/IntegratedLightDM/QLightDM
- qml/Dash/Previews/PreviewSingleton
- qml/Greeter/graphics/session_icons
- tests/mocks/LightDM/IntegratedLightDM
- tests/mocks/SessionBroadcast
- tests/plugins/ImageCache
- tests/plugins/ImageCache/graphics
- tests/plugins/LightDM/IntegratedLightDM
- tests/plugins/SessionBroadcast
- files removed:
- plugins/IntegratedLightDM/qmldir
- tests/mocks/libusermetrics/libusermetricsoutput/ColorTheme.h
- tests/mocks/libusermetrics/libusermetricsoutput/UserMetrics.h
- files renamed:
- plugins/IntegratedLightDM/ => plugins/LightDM/
- plugins/IntegratedLightDM/liblightdm/ => plugins/LightDM/IntegratedLightDM/liblightdm/
- qml/Components/Circle.qml => qml/Greeter/Circle.qml
- qml/Components/DelayedLockscreen.qml => qml/Greeter/DelayedLockscreen.qml
- qml/Greeter/LightDM.qml => qml/Greeter/LightDMService.qml
- tests/mocks/IntegratedLightDM/ => tests/mocks/LightDM/
- tests/mocks/IntegratedLightDM/CMakeLists.txt => tests/mocks/LightDM/IntegratedLightDM/CMakeLists.txt
- tests/mocks/IntegratedLightDM/MockGreeter.cpp => tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp
- tests/mocks/IntegratedLightDM/MockGreeter.h => tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h
- tests/mocks/IntegratedLightDM/MockUsersModel.cpp => tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp
- tests/mocks/IntegratedLightDM/MockUsersModel.h => tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h
- tests/mocks/IntegratedLightDM/QLightDM/ => tests/mocks/LightDM/IntegratedLightDM/QLightDM/
- tests/mocks/IntegratedLightDM/liblightdm/ => tests/mocks/LightDM/IntegratedLightDM/liblightdm/
- tests/mocks/IntegratedLightDM/plugin.cpp => tests/mocks/LightDM/IntegratedLightDM/plugin.cpp
- tests/mocks/IntegratedLightDM/plugin.h => tests/mocks/LightDM/IntegratedLightDM/plugin.h
- tests/mocks/IntegratedLightDM/qmldir => tests/mocks/LightDM/IntegratedLightDM/qmldir
- tests/plugins/IntegratedLightDM/ => tests/plugins/LightDM/
- tests/plugins/IntegratedLightDM/CMakeLists.txt => tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt
- tests/plugins/IntegratedLightDM/dbus.cpp => tests/plugins/LightDM/IntegratedLightDM/dbus.cpp
- tests/plugins/IntegratedLightDM/greeter.qml => tests/plugins/LightDM/IntegratedLightDM/greeter.qml
- tests/plugins/IntegratedLightDM/integrated.cpp => tests/plugins/LightDM/IntegratedLightDM/integrated.cpp
- tests/plugins/IntegratedLightDM/pam.cpp => tests/plugins/LightDM/IntegratedLightDM/pam.cpp
- tests/plugins/IntegratedLightDM/usersmodel.cpp => tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
qml/Greeter/graphics/infographic_circle_back.png
qml/Greeter/graphics/session_icons/gnome_badge.png
qml/Greeter/graphics/session_icons/kde_badge.png
qml/Greeter/graphics/session_icons/recovery_console_badge.png
qml/Greeter/graphics/session_icons/ubuntu_badge.png
qml/Greeter/graphics/session_icons/unknown_badge.png
qml/graphics/phone_background.jpg
qml/graphics/tablet_background.jpg
tests/plugins/ImageCache/graphics/wide.jpg
