summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-19 00:16:59 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-19 00:16:59 (GMT)
commit7d89ca8957ed4aac56822001d4ef84913e7362ae (patch)
tree310d1c6b082073d09ea3c716eb90834de51bd600 /src/multimedia
parent7f52cac95b1e83cb9f5d9a9952c001688ea5bb8a (diff)
parentbbc16f62a3d3e53532c37672b23047302fbeb1a5 (diff)
downloadQt-7d89ca8957ed4aac56822001d4ef84913e7362ae.zip
Qt-7d89ca8957ed4aac56822001d4ef84913e7362ae.tar.gz
Qt-7d89ca8957ed4aac56822001d4ef84913e7362ae.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed stability issues in qgraphicswidget tests
Diffstat (limited to 'src/multimedia')
0 files changed, 0 insertions, 0 deletions