« back to all changes in this revision
Viewing changes to modules/Ubuntu/PerformanceMetrics/qmldir
- Committer: Christian Dywan
- Date: 2014-04-30 10:22:44 UTC
- mfrom: (1000.17.3 staging)
- mto: (1000.41.5 staging)
- mto: This revision was merged to the branch mainline in revision 1022.
- Revision ID: christian.dywan@canonical.com-20140430102244-uti97msd0thmk31d
Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging
- files added:
- modules/Ubuntu/Components/ComboButton.qml
- modules/Ubuntu/Components/Styles
- modules/Ubuntu/Test/plugin
- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects
- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects
- tests/resources/buttons
- tests/resources/inputs
- files removed:
- debian/ubuntu-ui-toolkit-autopilot.docs
- docs-autopilot-emulator
- docs-autopilot-emulator/_static
- docs-autopilot-emulator/_templates
- files renamed:
- tests/autopilot/ubuntuuitoolkit/emulators.py => tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py
- files modified:
- CHANGES
added
removed
modules/Ubuntu/PerformanceMetrics/qmldir
