Viewing all changes in revision 1163.
- Committer: Michael Terry
- Date: 2014-08-21 12:53:29 UTC
- mfrom: (1161.1.23 unity8)
- Revision ID: michael.terry@canonical.com-20140821125329-8c14utjip4id3e7m
Merge from trunk
- files removed:
- tests/mocks/Unity/Indicators/CachedUnityMenuModel.qml
- files renamed:
- qml/Components/PageHeader.qml => qml/Dash/PageHeader.qml
- qml/Components/graphics/PageHeaderBaseDivider@18.png => qml/Dash/graphics/PageHeaderBaseDivider@18.png
- qml/Components/graphics/PageHeaderBaseDivider@18.sci => qml/Dash/graphics/PageHeaderBaseDivider@18.sci
- qml/Components/graphics/pagination_dot_off@30.png => qml/Dash/graphics/pagination_dot_off@30.png
- qml/Components/graphics/pagination_dot_on@30.png => qml/Dash/graphics/pagination_dot_on@30.png
- plugins/Unity/Indicators/CachedUnityMenuModel.qml => qml/Panel/Indicators/CachedUnityMenuModel.qml
- tests/qmltests/Components/tst_PageHeader.qml => tests/qmltests/Dash/tst_PageHeader.qml
- tests/qmltests/Components/tst_PageHeader/ => tests/qmltests/Dash/tst_PageHeader/
- files modified:
- build.sh
expand all
collapse all
added
removed
