← Back to branch summary

~nick-dedekind/ubuntu-ui-toolkit/prevent-slider-mouse-stealing

~nick-dedekind/ubuntu-ui-toolkit/prevent-slider-mouse-stealing

Viewing all changes in revision 1000.470.20.

Committer: Zsombor Egri
Date: 2015-04-17 07:44:17 UTC
mfrom: (1000.444.25 staging)
mto: (1000.471.1 staging)
mto: This revision was merged to the branch mainline in revision 1178.
Revision ID: zsombor.egri@canonical.com-20150417074417-zkp2dbrhx4se1qzx

staging sync

files added:
modules/Ubuntu/Components/tools

modules/Ubuntu/Components/tools/3rd_party

modules/Ubuntu/Components/tools/3rd_party/edtaa3func.c

modules/Ubuntu/Components/tools/createshapeimage.cpp

modules/Ubuntu/Components/tools/shape.svg

modules/Ubuntu/Components/tools/tools.pro

tests/unit_x11/tst_subtheming/InvalidPalette.qml

files modified:
.bzrignore

components.api

debian/copyright

modules/Ubuntu/Components/TextArea.qml

modules/Ubuntu/Components/TextField.qml

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

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

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

modules/Ubuntu/Components/plugin/shaders/shape.frag

modules/Ubuntu/Components/plugin/shaders/shapeoverlay.frag

modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp

modules/Ubuntu/Components/plugin/ucstyleditembase.cpp

modules/Ubuntu/Components/plugin/ucubuntushape.cpp

modules/Ubuntu/Components/plugin/ucubuntushape.h

modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp

modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.h

modules/Ubuntu/Components/plugin/ucubuntushapetexture.h

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py

tests/resources/subtheming/Simple.qml

tests/resources/ubuntushape/UbuntuShapeOverlayTest.qml

tests/resources/ubuntushape/UbuntuShapeTest.qml

tests/unit_x11/tst_subtheming/tst_subtheming.cpp

tests/unit_x11/tst_subtheming/tst_subtheming.pro

Show diffs side-by-side

added added

removed removed

debian/copyright

modules/Ubuntu/Components/TextArea.qml

modules/Ubuntu/Components/TextField.qml

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

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

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

modules/Ubuntu/Components/plugin/shaders/shape.frag

modules/Ubuntu/Components/plugin/shaders/shapeoverlay.frag

modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp

modules/Ubuntu/Components/plugin/ucstyleditembase.cpp

modules/Ubuntu/Components/plugin/ucubuntushape.cpp

modules/Ubuntu/Components/plugin/ucubuntushape.h

modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp

modules/Ubuntu/Components/plugin/ucubuntushapeoverlay.h

modules/Ubuntu/Components/plugin/ucubuntushapetexture.h

modules/Ubuntu/Components/tools/

modules/Ubuntu/Components/tools/3rd_party/

modules/Ubuntu/Components/tools/3rd_party/edtaa3func.c

modules/Ubuntu/Components/tools/createshapeimage.cpp

modules/Ubuntu/Components/tools/shape.svg

modules/Ubuntu/Components/tools/tools.pro

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py

tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py

tests/resources/subtheming/Simple.qml

tests/resources/ubuntushape/UbuntuShapeOverlayTest.qml

tests/resources/ubuntushape/UbuntuShapeTest.qml

tests/unit_x11/tst_subtheming/InvalidPalette.qml

tests/unit_x11/tst_subtheming/tst_subtheming.cpp

tests/unit_x11/tst_subtheming/tst_subtheming.pro

Older »