Viewing all changes in revision 1370.
- 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
expand all
collapse all
added
removed
qml/Components/ListItems/graphics/ListItemDividerVertical@18.png
qml/Hud/graphics/divider@20.png
qml/Hud/graphics/help@20.png
qml/Hud/graphics/hud_bg@20.png
qml/Hud/graphics/hud_handlearrow@20.png
qml/Hud/graphics/hud_handlebar@20.png
qml/Hud/graphics/icon_arrow@20.png
qml/Hud/graphics/icon_clear@20.png
qml/Hud/graphics/icon_search@20.png
qml/Hud/graphics/microphone@20.png
qml/Hud/graphics/popup_triangle@20.png
qml/Hud/graphics/settings@20.png
qml/Hud/graphics/undo@20.png
qml/Hud/graphics/view-fullscreen@20.png
qml/Launcher/graphics/quicklist_tooltip@30.png
