summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-24 14:21:39 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-24 14:21:39 (GMT)
commit981b7c1be2e0316c326b8e8485855c8d1812b8cc (patch)
tree6c437de7989bca892614d65608bd3f3fd1f8f45d /tools
parent298280f8e553ebb4a949e8ea3d380dd23ef097e3 (diff)
parent997dc8bdfc927bc730a04dad5b88f46dab6eeaba (diff)
downloadQt-981b7c1be2e0316c326b8e8485855c8d1812b8cc.zip
Qt-981b7c1be2e0316c326b8e8485855c8d1812b8cc.tar.gz
Qt-981b7c1be2e0316c326b8e8485855c8d1812b8cc.tar.bz2
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: QNAM HTTP: Switch back to QueuedConnection for requeueRequest. QNAM HTTP: Set some values after clear() in a QHttpNetworkReply QNetworkAccessManager: Documentation enhancements
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions