diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-11 13:29:44 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-11 13:29:44 +0200 |
| commit | 6a0f7951726061ea260a459840151b5e72f6e116 (patch) | |
| tree | 036b106a80ef26443df908dfe130337d42efa619 /.tag | |
| parent | f3d6fe82ab8c1c2b4fda4f4a87a68e86cd1f2a4f (diff) | |
| parent | e16cdebb775c1a7c3f35f7ea68e017c38ce3fd36 (diff) | |
Merge branch 'stable' into dev
Conflicts:
qtactiveqt
qtbase
qtdeclarative
qtdoc
qtgraphicaleffects
qtjsbackend
qtmultimedia
qtquick1
qtquickcontrols
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtxmlpatterns
Change-Id: I5ca751a71375fba0c154db187e89bac6f3fa7ad1
Diffstat (limited to '.tag')
0 files changed, 0 insertions, 0 deletions