Viewing all changes in revision 744.
- Committer: Florian Boucault
- Date: 2013-11-05 20:38:07 UTC
- mfrom: (742.1.77 trunk)
- Revision ID: florian.boucault@canonical.com-20131105203807-rmkjy15wtqiondeo
Merged from trunk
- files added:
- documentation/snippets/statesaver
- modules/Ubuntu/Components/Pickers
- modules/Ubuntu/Components/Themes/SuruDark/artwork
- tests/resources/themes
- tests/resources/themes/CustomTheme
- tests/resources/themes/TestModule
- tests/resources/themes/TestModule/TestTheme
- tests/resources/urihandler
- tests/unit/tst_i18n
- tests/unit/tst_i18n/locale
- tests/unit/tst_i18n/locale/en
- tests/unit/tst_i18n/locale/en/LC_MESSAGES
- tests/unit/tst_i18n/po
- tests/unit/tst_i18n/src
- tests/unit/tst_mainview
- tests/unit_x11/tst_orientation
- tests/unit_x11/tst_recreateview
- tests/unit_x11/tst_statesaver
- files removed:
- examples/ubuntu-ui-toolkit-gallery/po/generate_mo.sh
- files renamed:
- modules/Ubuntu/Components/all-modules.qdoc => documentation/all-modules.qdoc
- modules/Ubuntu/Components/overview.qdoc => documentation/overview.qdoc
- modules/Ubuntu/Components/resolution-independence.qdoc => documentation/resolution-independence.qdoc
- modules/Ubuntu/Components/ListItems/ubuntu-components-listitems.qdoc => documentation/ubuntu-components-listitems.qdoc
- modules/Ubuntu/Components/Popups/ubuntu-components-popups.qdoc => documentation/ubuntu-components-popups.qdoc
- modules/Ubuntu/Components/ubuntu-components.qdoc => documentation/ubuntu-components.qdoc
- modules/Ubuntu/Layouts/ubuntu-layouts.qdoc => documentation/ubuntu-layouts.qdoc
- tests/unit/tst_components/tst_tabs.qml => tests/unit_x11/tst_components/tst_tabs.qml
- tests/unit/tst_components/tst_toolbar.qml => tests/unit_x11/tst_components/tst_toolbar.qml
- tests/unit/tst_theme_engine/ => tests/unit_x11/tst_theme_engine/
- files modified:
- CHANGES
expand all
collapse all
added
removed
modules/Ubuntu/Components/ListItems/artwork/delete@8.png
modules/Ubuntu/Components/Themes/Ambiance/artwork/chevron@18.png
modules/Ubuntu/Components/Themes/Ambiance/artwork/chevron@27.png
modules/Ubuntu/Components/Themes/SuruDark/artwork/chevron@27.png
modules/Ubuntu/Components/Themes/SuruGradient/artwork/chevron@27.png
