Viewing all changes in revision 772.
- Committer: Christian Dywan
- Date: 2014-06-05 15:02:13 UTC
- mfrom: (700.207.159 staging)
- Revision ID: christian.dywan@canonical.com-20140605150213-59k3jdozkxcqrx5a
Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging
- files added:
- modules/Ubuntu/Components/ComboButton.qml
- modules/Ubuntu/Components/Styles
- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects
- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects
- tests/launcher
- tests/resources/buttons
- tests/resources/inputs
- tests/unit/tst_i18n/localizedApp/.click
- tests/unit/tst_i18n/localizedApp/share
- tests/unit/tst_i18n/appropriate/localizedApp
- files renamed:
- tests/autopilot/ubuntuuitoolkit/emulators.py => tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py
- tests/unit/tst_i18n/appropriate/ => tests/unit/tst_i18n/localizedApp/
- tests/unit/tst_i18n/appropriate/locale/ => tests/unit/tst_i18n/localizedApp/share/locale/
- files modified:
- CHANGES
expand all
collapse all
added
removed
modules/Ubuntu/Components/ListItems/artwork/ListItemDividerHorizontal@18.png
modules/Ubuntu/Components/Themes/Ambiance/artwork/teardrop-left@20.png
modules/Ubuntu/Components/Themes/Ambiance/artwork/teardrop-right@20.png
