Merge branch 'stable' into dev dev_1373544554 04/60904/1
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 11 Jul 2013 11:29:44 +0000 (13:29 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Thu, 11 Jul 2013 11:29:44 +0000 (13:29 +0200)
Conflicts:
qtactiveqt
qtbase
qtdeclarative
qtdoc
qtgraphicaleffects
qtjsbackend
qtmultimedia
qtquick1
qtquickcontrols
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtxmlpatterns

Change-Id: I5ca751a71375fba0c154db187e89bac6f3fa7ad1

1  2 
qt.pro

diff --cc qt.pro
Simple merge