Viewing all changes in revision 1982.
- Committer: Josh Arenson
- Date: 2016-03-25 19:51:37 UTC
- mfrom: (1789.254.100 unity8)
- Revision ID: joshua.arenson@canonical.com-20160325195137-y9ba9ggl0y8z2m7o
merge trunk
- files added:
- plugins/Cursor/Cursor.qmltypes
- qml/Dash/Filters
- qml/Wizard/Pages/data/timezonemap
- tests/mocks/Ubuntu/SystemSettings/Diagnostics
- tests/mocks/Ubuntu/SystemSettings/TimeDate
- tests/qmltests/Dash/Filters
- files removed:
- qml/Components/Unity8Settings.qml
- files renamed:
- plugins/Utils/windowkeysfilter.cpp => plugins/Utils/windowinputfilter.cpp
- plugins/Utils/windowkeysfilter.h => plugins/Utils/windowinputfilter.h
- qml/Wizard/Pages/40-wifi.qml => qml/Wizard/Pages/30-wifi.qml
- qml/Wizard/Pages/50-location.qml => qml/Wizard/Pages/40-location.qml
- qml/Wizard/Pages/30-passwd-type.qml => qml/Wizard/Pages/70-passwd-type.qml
- qml/Wizard/Pages/passwd-confirm.qml => qml/Wizard/Pages/passcode-confirm.qml
- qml/Wizard/Pages/passwd-set.qml => qml/Wizard/Pages/passcode-set.qml
- qml/Wizard/Pages/20-sim.qml => qml/Wizard/Pages/sim.qml
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
qml/Stages/graphics/sidestage_drag.svg
qml/Stages/graphics/sidestage_open.svg
qml/Tutorial/graphics/arrow.svg
qml/Tutorial/graphics/background1.png
qml/Tutorial/graphics/background2.png
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/Desktop_header_bkg.png
qml/Wizard/Pages/data/Desktop_splash_screen_bkg.png
qml/Wizard/Pages/data/Phone_header_bkg.png
qml/Wizard/Pages/data/Phone_splash_screen_bkg.png
qml/Wizard/Pages/data/Tick@30.png
qml/Wizard/Pages/data/meet_ubuntu_simcard@30.png
qml/Wizard/Pages/data/timezonemap/map.png
qml/Wizard/Pages/data/timezonemap/pin.png
qml/Wizard/Pages/data/timezonemap/timezone_-1.png
qml/Wizard/Pages/data/timezonemap/timezone_-10.png
qml/Wizard/Pages/data/timezonemap/timezone_-11.png
qml/Wizard/Pages/data/timezonemap/timezone_-2.png
qml/Wizard/Pages/data/timezonemap/timezone_-3.5.png
qml/Wizard/Pages/data/timezonemap/timezone_-3.png
qml/Wizard/Pages/data/timezonemap/timezone_-4.5.png
qml/Wizard/Pages/data/timezonemap/timezone_-4.png
qml/Wizard/Pages/data/timezonemap/timezone_-5.png
qml/Wizard/Pages/data/timezonemap/timezone_-6.png
qml/Wizard/Pages/data/timezonemap/timezone_-7.png
qml/Wizard/Pages/data/timezonemap/timezone_-8.png
qml/Wizard/Pages/data/timezonemap/timezone_-9.5.png
qml/Wizard/Pages/data/timezonemap/timezone_-9.png
qml/Wizard/Pages/data/timezonemap/timezone_0.png
qml/Wizard/Pages/data/timezonemap/timezone_1.png
qml/Wizard/Pages/data/timezonemap/timezone_10.5.png
qml/Wizard/Pages/data/timezonemap/timezone_10.png
qml/Wizard/Pages/data/timezonemap/timezone_11.png
qml/Wizard/Pages/data/timezonemap/timezone_12.75.png
qml/Wizard/Pages/data/timezonemap/timezone_12.png
qml/Wizard/Pages/data/timezonemap/timezone_13.png
qml/Wizard/Pages/data/timezonemap/timezone_2.png
qml/Wizard/Pages/data/timezonemap/timezone_3.5.png
qml/Wizard/Pages/data/timezonemap/timezone_3.png
qml/Wizard/Pages/data/timezonemap/timezone_4.5.png
qml/Wizard/Pages/data/timezonemap/timezone_4.png
qml/Wizard/Pages/data/timezonemap/timezone_5.5.png
qml/Wizard/Pages/data/timezonemap/timezone_5.75.png
qml/Wizard/Pages/data/timezonemap/timezone_5.png
qml/Wizard/Pages/data/timezonemap/timezone_6.5.png
qml/Wizard/Pages/data/timezonemap/timezone_6.png
qml/Wizard/Pages/data/timezonemap/timezone_7.png
qml/Wizard/Pages/data/timezonemap/timezone_8.5.png
qml/Wizard/Pages/data/timezonemap/timezone_8.png
qml/Wizard/Pages/data/timezonemap/timezone_9.5.png
qml/Wizard/Pages/data/timezonemap/timezone_9.png
