← Back to branch summary

~tpeeters/ubuntu-ui-toolkit/10-headAnimate

~tpeeters/ubuntu-ui-toolkit/10-headAnimate

Viewing all changes in revision 1206.

Committer: Tim Peeters
Date: 2014-08-20 12:50:48 UTC
mfrom: (1160.30.8 staging)
Revision ID: tim.peeters@canonical.com-20140820125048-7xcsgvc4ohxnujth

merge staging

files added:
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.png

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquickgridview.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquickgridview.QQuickGridViewTestCase.qml

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquickgridview.py

tests/unit/tst_mainview/Settings.qml

files modified:
debian/control

examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop

modules/Ubuntu/Components/ListItems/Empty.qml

modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml

modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/Palette.qml

modules/Ubuntu/Components/plugin/ucapplication.cpp

tests/autopilot/ubuntuuitoolkit/__init__.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_checkbox.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_optionselector.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabbar.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabs.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py

tests/autopilot/ubuntuuitoolkit/tests/__init__.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py

tests/unit/tst_mainview/tst_mainview.cpp

Show diffs side-by-side

added added

removed removed

examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop

examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.png

modules/Ubuntu/Components/ListItems/Empty.qml

modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml

modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml

modules/Ubuntu/Components/Themes/Ambiance/Palette.qml

modules/Ubuntu/Components/plugin/ucapplication.cpp

tests/autopilot/ubuntuuitoolkit/__init__.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_checkbox.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_optionselector.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquickgridview.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabbar.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabs.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py

tests/autopilot/ubuntuuitoolkit/tests/__init__.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquickgridview.QQuickGridViewTestCase.qml

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquickgridview.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py

tests/unit/tst_mainview/Settings.qml

tests/unit/tst_mainview/tst_mainview.cpp

Older »