« back to all changes in this revision
Viewing changes to plugins/Unity/Indicators/plugin.h
- Committer: Michael Terry
- Date: 2014-11-17 14:56:04 UTC
- mfrom: (1317.1.118 unity8)
- Revision ID: michael.terry@canonical.com-20141117145604-96dn9p5nwkifq2f4
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:
- build.sh
added
removed
plugins/Unity/Indicators/plugin.h
