« back to all changes in this revision
Viewing changes to qml/Wizard/Pages/data/timezonemap/timezone_-9.png
- Committer: Michał Sawicz
- Date: 2016-07-15 09:51:02 UTC
- mfrom: (2400.1.142 unity8)
- Revision ID: michal.sawicz@canonical.com-20160715095102-hf5ac4iqnfn1itpw
Merge trunk
- files added:
- data/51-unity8-greeter.conf
- plugins/LightDM/FullLightDM
- plugins/LightDM/IntegratedLightDM
- plugins/LightDM/IntegratedLightDM/QLightDM
- qml/Components/MediaServices
- tests/mocks/Biometryd
- tests/mocks/LightDM/IntegratedLightDM
- tests/plugins/Cursor
- tests/plugins/LightDM/IntegratedLightDM
- files removed:
- libs
- libs/UbuntuGestures
- tests/libs
- tests/libs/UbuntuGestures
- 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/
- plugins/Ubuntu/Gestures/FloatingFlickable.cpp => plugins/Ubuntu/Gestures/MouseEventGenerator.cpp
- plugins/Ubuntu/Gestures/FloatingFlickable.h => plugins/Ubuntu/Gestures/MouseEventGenerator.h
- qml/Dash/Previews/PreviewSharing.qml => qml/Components/SharingPicker.qml
- qml/Greeter/LightDM.qml => qml/Greeter/LightDMService.qml
- tools/unix-signal-handler.cpp => src/UnixSignalHandler.cpp
- tools/unix-signal-handler.h => src/UnixSignalHandler.h
- 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/qmltests/Components/tst_DragHandle/HorizontalShowable.qml => tests/qmltests/Components/tst_DragHandle/LeftEdgeShowable.qml
- tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml => tests/qmltests/Components/tst_DragHandle/TopEdgeShowable.qml
- tests/qmltests/Dash/Previews/tst_PreviewSharing.qml => tests/qmltests/Components/tst_SharingPicker.qml
- files modified:
- CMakeLists.txt
added
removed
qml/Wizard/Pages/data/timezonemap/timezone_-9.png
