summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-07-15 13:43:26 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-07-15 13:43:26 (GMT)
commitc0b8b0f58bad6c238398055ef4c8aa8d45d1306d (patch)
treee500fe7cd1d8fd269a9ef5a0fa91dcce74174dd1 /src/corelib/tools
parent34fc612144f204d130307dc9d64657340a9d7f7d (diff)
parentb66db48934bc13cc7439e0fc9c8ec54122678a02 (diff)
downloadQt-c0b8b0f58bad6c238398055ef4c8aa8d45d1306d.zip
Qt-c0b8b0f58bad6c238398055ef4c8aa8d45d1306d.tar.gz
Qt-c0b8b0f58bad6c238398055ef4c8aa8d45d1306d.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 for futexes in QMutex.
Diffstat (limited to 'src/corelib/tools')
0 files changed, 0 insertions, 0 deletions