diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-22 14:33:09 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-22 14:33:09 (GMT) |
commit | cfa6c0921a0832af1e01576be9688b9f7015e323 (patch) | |
tree | 103e79210cf369b1f718cadc2f37aa029227e91c /tests/auto | |
parent | b8327a0d5c5192750f7bf959290f6a50cdcb85b5 (diff) | |
parent | f6735134a3637ae09442ad592f74a551830577fc (diff) | |
download | Qt-cfa6c0921a0832af1e01576be9688b9f7015e323.zip Qt-cfa6c0921a0832af1e01576be9688b9f7015e323.tar.gz Qt-cfa6c0921a0832af1e01576be9688b9f7015e323.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fix the timeout calculation again.
Diffstat (limited to 'tests/auto')
0 files changed, 0 insertions, 0 deletions