Frederik Gladhorn 8b6ae1cdd9 Merge remote-tracking branch 'origin/stable' into dev ...

All submodules are kept at their dev branch version.

Conflicts:
	qtactiveqt
	qtbase
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtimageformats
	qtjsbackend
	qtmultimedia
	qtqa
	qtquick1
	qtrepotools
	qtscript
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples-and-demos
	qtxmlpatterns

Change-Id: Ib9086eb5fef5580792286c9c6efd0f30e186543d

2013-02-20 10:40:05 +01:00

4.8 KiB

Raw Blame History

View Raw