diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-07 04:31:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-07 04:31:31 (GMT) |
| commit | 7327d31b4e20bd4b3e3bad95c2fba3eb7a548dbb (patch) | |
| tree | 3c7e7b05b38d7f16d0119bd9bd74a0cf1a8c5de6 /src | |
| parent | 54b863e87706fa0c2b1320b9dc047df96b5420c4 (diff) | |
| parent | b81f90ac0ff2be8f73bda785bb644281d515c291 (diff) | |
| download | Qt-7327d31b4e20bd4b3e3bad95c2fba3eb7a548dbb.zip Qt-7327d31b4e20bd4b3e3bad95c2fba3eb7a548dbb.tar.gz Qt-7327d31b4e20bd4b3e3bad95c2fba3eb7a548dbb.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:
Remove qWait functions as it is used in QTRY_* macros.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions