summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-17 12:40:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-17 12:40:47 (GMT)
commitd61c74faef2ed787aacc53c03b8361fa57bccc8e (patch)
treefd6af6c9006aed9f1c494706f66b44a3b9ee172d /src/multimedia
parent933b363a41a933345d4023c3350ee25587adcbb5 (diff)
parent413e7219045db14521787bdb41619250d6ad20a0 (diff)
downloadQt-d61c74faef2ed787aacc53c03b8361fa57bccc8e.zip
Qt-d61c74faef2ed787aacc53c03b8361fa57bccc8e.tar.gz
Qt-d61c74faef2ed787aacc53c03b8361fa57bccc8e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Rebuild configure.exe. QDeclarativeDebugTrace: Do not send message if the client did not enabled CanvasFrameRate
Diffstat (limited to 'src/multimedia')
0 files changed, 0 insertions, 0 deletions