« back to all changes in this revision
Viewing changes to qml/Wizard/Pages/data/timezonemap/timezone_-4.png
- Committer: Albert Astals Cid
- Date: 2016-11-28 09:57:06 UTC
- mfrom: (2704 unity8)
- mto: (2659.4.2 ecm_optional_santizers)
- mto: This revision was merged to the branch mainline in revision 2728.
- Revision ID: albert.astals@canonical.com-20161128095706-rzjv4q9a6mvuz6wd
Merge
- files added:
- .crossbuilder
- plugins/ImageCache
- plugins/LightDM/FullLightDM
- plugins/LightDM/IntegratedLightDM
- plugins/LightDM/IntegratedLightDM/QLightDM
- qml/Components/MediaServices
- qml/Dash/Previews/PreviewSingleton
- qml/Greeter/graphics/session_icons
- qml/Stage/Spread
- tests/mocks/Biometryd
- tests/mocks/LightDM/IntegratedLightDM
- tests/mocks/SessionBroadcast
- tests/plugins/ImageCache
- tests/plugins/ImageCache/graphics
- tests/plugins/LightDM/IntegratedLightDM
- tests/plugins/SessionBroadcast
- tests/plugins/Unity/Launcher/applications
- files removed:
- plugins/AccountsService/AccountsService.qmltypes
- qml/Components/ListItems/graphics
- 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/Dash/Previews/PreviewSharing.qml => qml/Components/SharingPicker.qml
- qml/Components/ListItems/Header.qml => qml/Dash/DashSectionHeader.qml
- qml/Components/Circle.qml => qml/Greeter/Circle.qml
- qml/Components/DelayedLockscreen.qml => qml/Greeter/DelayedLockscreen.qml
- qml/Greeter/LightDM.qml => qml/Greeter/LightDMService.qml
- qml/Stages/ => qml/Stage/
- qml/Stages/DesktopStage.qml => qml/Stage/Stage.qml
- qml/Stages/graphics/dropshadow2gu@30.png => qml/graphics/dropshadow2gu@30.png
- qml/Stages/graphics/dropshadow2gu@30.sci => qml/graphics/dropshadow2gu@30.sci
- 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/mocks/QtMultimedia/audio.cpp => tests/mocks/QtMultimedia/mediaplayer.cpp
- tests/mocks/QtMultimedia/audio.h => tests/mocks/QtMultimedia/mediaplayer.h
- 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
- tests/plugins/Unity/Launcher/abs-icon.desktop => tests/plugins/Unity/Launcher/applications/abs-icon.desktop
- tests/plugins/Unity/Launcher/click-icon.desktop => tests/plugins/Unity/Launcher/applications/click-icon.desktop
- tests/plugins/Unity/Launcher/click-icon.svg => tests/plugins/Unity/Launcher/applications/click-icon.svg
- tests/plugins/Unity/Launcher/no-name.desktop => tests/plugins/Unity/Launcher/applications/no-name.desktop
- tests/plugins/Unity/Launcher/rel-icon.desktop => tests/plugins/Unity/Launcher/applications/rel-icon.desktop
- tests/plugins/Unity/Launcher/rel-icon.svg => tests/plugins/Unity/Launcher/applications/rel-icon.svg
- tests/qmltests/Dash/Previews/tst_PreviewSharing.qml => tests/qmltests/Components/tst_SharingPicker.qml
- tests/qmltests/Stages/ => tests/qmltests/Stage/
- files modified:
- CMakeLists.txt
added
removed
qml/Wizard/Pages/data/timezonemap/timezone_-4.png
