diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 01:38:37 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 01:38:37 (GMT) |
commit | 01bf5e0d21c971c39473dff9e4e47324c699afaf (patch) | |
tree | 99d6bc51bc28d8c0437c9ae996ba9852f2f46850 /src | |
parent | 186c59d34b4e35018850570719f3a9c553f391e0 (diff) | |
parent | dc2e494acbd0a8e371c9fd92aef2da6975c5cccb (diff) | |
download | Qt-01bf5e0d21c971c39473dff9e4e47324c699afaf.zip Qt-01bf5e0d21c971c39473dff9e4e47324c699afaf.tar.gz Qt-01bf5e0d21c971c39473dff9e4e47324c699afaf.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 race condition compiling xmlpatterns tests.
Remove qdbusserver from tests/auto/dbus.pro
Remove garbage test.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions