Viewing all changes in revision 1181.
- Committer: Gerry Boland
- Date: 2015-05-07 12:17:18 UTC
- mfrom: (1000.444.44 staging)
- Revision ID: gerry.boland@canonical.com-20150507121718-ereyeoiqrb4bru28
Merge staging
- files added:
- examples/1.3
- tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/1.2
- tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.2
- files renamed:
- examples/calculator/ => examples/1.3/calculator/
- examples/customtheme/ => examples/1.3/customtheme/
- examples/jokes/ => examples/1.3/jokes/
- examples/locale/ => examples/1.3/locale/
- examples/ubuntu-ui-toolkit-gallery/ => examples/1.3/ubuntu-ui-toolkit-gallery/
- examples/unit-converter/ => examples/1.3/unit-converter/
- tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/TestStyle.qml => tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/1.2/TestStyle.qml
- tests/unit_x11/tst_subtheming/TestModule/ => tests/unit_x11/tst_subtheming/CustomModule/
- tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/TestStyle.qml => tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.2/TestStyle.qml
- files modified:
- components.api
expand all
collapse all
added
removed
tests/unit/tst_components/demo_image.jpg
tests/unit/tst_components/map_icon.png
