diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-20 10:38:41 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-20 10:40:05 +0100 |
| commit | 8b6ae1cdd948b3286c4eea57b7f68610d103c180 (patch) | |
| tree | b5c8a903a6fee2b502142659e9aaad6cea2b409a /qtx11extras | |
| parent | ff63f0f3dc60c731ec77ed53678c00c06953b0ee (diff) | |
| parent | 3d960ec9a9f11da295f603ca6fbfe80ee3681ae9 (diff) | |
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
Diffstat (limited to 'qtx11extras')
0 files changed, 0 insertions, 0 deletions