« back to all changes in this revision
Viewing changes to plugins/Ubuntu/Gestures/CMakeLists.txt
- Committer: Michael Terry
- Date: 2014-11-24 15:25:42 UTC
- mfrom: (1368.1.82 unity8)
- Revision ID: michael.terry@canonical.com-20141124152542-5cysva8ds3qfula6
Merge from trunk
- files added:
- plugins/ScreenGrabber
- files removed:
- plugins/HudClient
- qml/Components/Flickables
- qml/Hud
- qml/Hud/graphics
- tests/mocks/HudClient
- tests/mocks/Unity/Indicators/qml
- tests/qmltests/Hud
- files renamed:
- qml/Panel/Indicators/DefaultIndicatorPage.qml => qml/Panel/IndicatorPage.qml
- qml/Panel/Indicators/client/IndicatorsPage.qml => qml/Panel/Indicators/client/IndicatorRepresentation.qml
- tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml => tests/qmltests/Panel/tst_IndicatorPage.qml
- files modified:
- CMakeLists.txt
added
removed
plugins/Ubuntu/Gestures/CMakeLists.txt
