summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-24 21:16:04 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-24 21:16:04 +0200
commit6f6909ac6681ed614f00998a0d43b7b195dbb90b (patch)
tree1eabc9994f874c18a74426712ff23185d4ea4876 /dist
parent54b3c2bb7909cf195d81eeebf2be66d2685bb20d (diff)
parentfd256203708e79d64bad856e39bb5a43357bfd06 (diff)
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a race condition with QtDBus blocking for replies. QtDBus: Debug message update
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions