diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-17 04:52:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-17 04:52:11 (GMT) |
| commit | 413e7219045db14521787bdb41619250d6ad20a0 (patch) | |
| tree | 50987bed56c916cca4f863b313ec17f9ec1ffb4c /src/multimedia | |
| parent | b59d460fdf02c3e2cb5d4ccfd284057643b952a7 (diff) | |
| parent | 956081702b5701ec570085174878a264c86c136b (diff) | |
| download | Qt-413e7219045db14521787bdb41619250d6ad20a0.zip Qt-413e7219045db14521787bdb41619250d6ad20a0.tar.gz Qt-413e7219045db14521787bdb41619250d6ad20a0.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