review.tizen.org Git - platform/upstream/qtdeclarative.git/commit

Merge remote-tracking branch 'origin/release' into stable

Conflicts:
examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc
examples/quick/accessibility/doc/src/accessibility.qdoc
examples/quick/animation/doc/src/animation.qdoc
examples/quick/canvas/doc/src/canvas.qdoc
examples/quick/draganddrop/doc/src/draganddrop.qdoc
examples/quick/imageelements/doc/src/imageelements.qdoc
examples/quick/keyinteraction/doc/src/keyinteraction.qdoc
examples/quick/localstorage/doc/src/localstorage.qdoc
examples/quick/mousearea/doc/src/mousearea.qdoc
examples/quick/particles/affectors/doc/src/affectors.qdoc
examples/quick/particles/customparticle/doc/src/customparticle.qdoc
examples/quick/particles/emitters/doc/src/emitters.qdoc
examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
examples/quick/particles/system/doc/src/system.qdoc
examples/quick/positioners/doc/src/positioners.qdoc
examples/quick/righttoleft/doc/src/righttoleft.qdoc
examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc
examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc
examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc
examples/quick/threading/doc/src/threading.qdoc
examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
examples/quick/views/doc/src/views.qdoc

Change-Id: Idf7bb76c82acacf86b19a9f4633c3cbf4ae1a9a0

author	Frederik Gladhorn <frederik.gladhorn@digia.com>
	Wed, 3 Apr 2013 14:16:08 +0000 (16:16 +0200)
committer	Frederik Gladhorn <frederik.gladhorn@digia.com>
	Wed, 3 Apr 2013 14:16:08 +0000 (16:16 +0200)
commit	acc94a42cd9c31ac68e063edc1caada4251d12b0
tree	19a4816cf3972b3d16235ed601788193fe0f20df	tree \| snapshot
parent	4c94a3ca55e82ade19ff5d4ab361d40e6252f2da	commit \| diff
parent	2223f1ae293c2aedf4759564185f74b782395459	commit \| diff

examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/accessibility/doc/src/accessibility.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/animation/doc/src/animation.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/canvas/doc/src/canvas.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/doc/src/qml-extending.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/draganddrop/doc/src/draganddrop.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/imageelements/doc/src/imageelements.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/keyinteraction/doc/src/keyinteraction.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/localstorage/doc/src/localstorage.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/mousearea/doc/src/mousearea.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/painteditem/textballoons/doc/src/textballoons.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/particles/affectors/doc/src/affectors.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/particles/customparticle/doc/src/customparticle.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/particles/emitters/doc/src/emitters.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/particles/system/doc/src/system.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/positioners/doc/src/positioners.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/righttoleft/doc/src/righttoleft.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/shadereffects/doc/src/shadereffects.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/text/doc/src/text.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/threading/doc/src/threading.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/touchinteraction/doc/src/touchinteraction.qdoc	diff1 \|	diff2 \|	blob \| history
examples/quick/views/doc/src/views.qdoc	diff1 \|	diff2 \|	blob \| history
src/qml/doc/qtqml.qdocconf	diff1 \|	diff2 \|	blob \| history
src/qml/doc/src/cppintegration/extending-tutorial.qdoc	diff1 \|	diff2 \|	blob \| history
src/quick/doc/qtquick.qdocconf	diff1 \|	diff2 \|	blob \| history
src/quick/doc/src/advtutorial.qdoc	diff1 \|	diff2 \|	blob \| history
src/quick/doc/src/dynamicview-tutorial.qdoc	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickpathview/tst_qquickpathview.cpp	diff1 \|	diff2 \|	blob \| history