Viewing all changes in revision 1197.
- Committer: Gerry Boland
- Date: 2015-07-27 12:05:54 UTC
- mfrom: (1000.531.33 staging)
- Revision ID: gerry.boland@canonical.com-20150727120554-u42hs5dkn1rshnfo
Merge staging and fix conflicts
- tests/apicheck/test
- tests/apicheck/test/Extinct
- tests/apicheck/test/Extinct/Animals
- files removed:
- modules/Ubuntu/Components/1.0/1.0.pro
- files renamed:
- documentation/documentation.pri => documentation/documentation.pro
- modules/ => src/
- modules/Ubuntu/Components/1.2/Icon10.qml => src/Ubuntu/Components/1.0/Icon.qml
- modules/Ubuntu/Components/1.2/ProgressBar10.qml => src/Ubuntu/Components/1.0/ProgressBar.qml
- modules/Ubuntu/Components/1.0/UbuntuColors10.qml => src/Ubuntu/Components/1.0/UbuntuColors.qml
- modules/Ubuntu/Components/1.2/Icon11.qml => src/Ubuntu/Components/1.1/Icon.qml
- modules/Ubuntu/Components/1.2/ProgressBar11.qml => src/Ubuntu/Components/1.1/ProgressBar.qml
- modules/Ubuntu/Components/plugin/plugin.pro => src/Ubuntu/Components/plugin/plugin.pri
- modules/Ubuntu/Layouts/plugin/plugin.pro => src/Ubuntu/Layouts/plugin/plugin.pri
- modules/Ubuntu/PerformanceMetrics/plugin/plugin.pro => src/Ubuntu/PerformanceMetrics/plugin/plugin.pri
- modules/Ubuntu/Test/plugin/plugin.pro => src/Ubuntu/Test/plugin/plugin.pri
- modules/ubuntu-ui-toolkit.pro => src/src.pro
- files modified:
- .bzrignore
expand all
collapse all
added
removed
src/Ubuntu/Components/Themes/Ambiance/artwork/caret_noshadow@27.png
