Viewing all changes in revision 2659.
- Committer: Josh Arenson
- Date: 2016-11-16 17:11:41 UTC
- mfrom: (2658.1.38 unity8)
- Revision ID: joshua.arenson@canonical.com-20161116171141-rlli04jc15fw1qzh
merge trunk
- files added:
- qml/Dash/graphics/overview_hint@30.png
- qml/Stage/Spread
- tests/plugins/Unity/Launcher/applications
- files removed:
- plugins/Unity/Launcher/desktopfilehandler.cpp
- qml/Components/ListItems/graphics
- files renamed:
- qml/Components/ListItems/Header.qml => qml/Dash/DashSectionHeader.qml
- qml/Stages/ => qml/Stage/
- qml/Stages/DesktopStage.qml => qml/Stage/Stage.qml
- qml/Stages/graphics/dropshadow2gu@30.png => qml/graphics/dropshadow2gu@30.png
- qml/Stages/graphics/dropshadow2gu@30.sci => qml/graphics/dropshadow2gu@30.sci
- tests/plugins/Unity/Launcher/abs-icon.desktop => tests/plugins/Unity/Launcher/applications/abs-icon.desktop
- tests/plugins/Unity/Launcher/click-icon.desktop => tests/plugins/Unity/Launcher/applications/click-icon.desktop
- tests/plugins/Unity/Launcher/click-icon.svg => tests/plugins/Unity/Launcher/applications/click-icon.svg
- tests/plugins/Unity/Launcher/no-name.desktop => tests/plugins/Unity/Launcher/applications/no-name.desktop
- tests/plugins/Unity/Launcher/rel-icon.desktop => tests/plugins/Unity/Launcher/applications/rel-icon.desktop
- tests/plugins/Unity/Launcher/rel-icon.svg => tests/plugins/Unity/Launcher/applications/rel-icon.svg
- tests/qmltests/Stages/ => tests/qmltests/Stage/
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
qml/Components/ListItems/graphics/ListItemDividerHorizontal@18.png
qml/Dash/graphics/dash_divider_top_darkgrad@27.png
qml/Dash/graphics/dash_divider_top_lightgrad@27.png
qml/Dash/graphics/overview_hint@27.png
qml/Dash/graphics/overview_hint@30.png
qml/Dash/graphics/pagination_dot_off@30.png
qml/Dash/graphics/pagination_dot_on@30.png
qml/Dash/graphics/paper.png
tests/graphics/applicationIcons/dash.png
tests/graphics/applicationIcons/dash@18.png
