Viewing all changes in revision 2494.3.12.
- Committer: Michael Zanetti
- Date: 2016-11-30 13:28:07 UTC
- mfrom: (2704 unity8)
- mto: This revision was merged to the branch mainline in revision 2739.
- Revision ID: michael.zanetti@canonical.com-20161130132807-c314dqdxenzwy69c
merge trunk
- files added:
- .crossbuilder
- plugins/ImageCache
- qml/Dash/Previews/PreviewSingleton
- qml/Greeter/graphics/session_icons
- qml/Stage/Spread
- tests/mocks/SessionBroadcast
- tests/plugins/ImageCache
- tests/plugins/ImageCache/graphics
- tests/plugins/SessionBroadcast
- 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/Components/Circle.qml => qml/Greeter/Circle.qml
- qml/Components/DelayedLockscreen.qml => qml/Greeter/DelayedLockscreen.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
qml/Greeter/graphics/infographic_circle_back.png
qml/Greeter/graphics/session_icons/gnome_badge.png
qml/Greeter/graphics/session_icons/kde_badge.png
qml/Greeter/graphics/session_icons/recovery_console_badge.png
qml/Greeter/graphics/session_icons/ubuntu_badge.png
qml/Greeter/graphics/session_icons/unknown_badge.png
qml/graphics/phone_background.jpg
qml/graphics/tablet_background.jpg
tests/graphics/applicationIcons/dash.png
tests/graphics/applicationIcons/dash@18.png
tests/plugins/ImageCache/graphics/wide.jpg
