Viewing all changes in revision 2146.
- Committer: Albert Astals Cid
- Date: 2016-02-19 11:48:26 UTC
- mfrom: (2143.1.60 unity8)
- Revision ID: albert.astals@canonical.com-20160219114826-ctquarjfkew3fmn7
Merge trunk
- files added:
- plugins/UInput
- tests/mocks/UInput
- tests/mocks/Unity/Screens
- files removed:
- qml/Dash/graphics/paper_landscape@27.png
- files renamed:
- plugins/Utils/HomeKeyWatcher.cpp => plugins/Utils/WindowInputMonitor.cpp
- plugins/Utils/HomeKeyWatcher.h => plugins/Utils/WindowInputMonitor.h
- tests/mocks/Utils/HomeKeyWatcher.qml => tests/mocks/Utils/WindowInputMonitor.qml
- tests/plugins/Utils/HomeKeyWatcherTest.cpp => tests/plugins/Utils/WindowInputMonitorTest.cpp
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
qml/Dash/graphics/paper.png
qml/Dash/graphics/paper_landscape@27.png
qml/Dash/graphics/paper_portrait@27.png
qml/Panel/graphics/Battery@18.png
qml/Panel/graphics/Bluetooth@18.png
qml/Panel/graphics/Clock@18.png
qml/Panel/graphics/Location@18.png
qml/Panel/graphics/Messages@18.png
qml/Panel/graphics/Network@18.png
qml/Panel/graphics/Sound@18.png
qml/Panel/graphics/Sync@18.png
qml/Panel/graphics/System@18.png
qml/Panel/graphics/Time@18.png
qml/Panel/graphics/VerticalDivider@18.png
qml/Panel/graphics/handle@12.png
qml/Panel/graphics/search@12.png
qml/Panel/graphics/time_and_date@18.png
