Merge branch '4.7' of ../qt-doc-team-threading into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Tue, 5 Apr 2011 14:41:44 +0000 (16:41 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Tue, 5 Apr 2011 14:41:44 +0000 (16:41 +0200)
commit17b9675da72ddf90a4ec8448b7c57681e482d91b
tree0c8597c38aa6b491e728fbf1cdf6b6ff41ecb4f4
parent0ea9bd7d6100993bb4b06b4dedb799ae768cacdf
parent9ee276e8a582679d50803b5c5a5f12f1b9aa9df5
Merge branch '4.7' of ../qt-doc-team-threading into 4.7

Conflicts:
doc/src/getting-started/tutorials.qdoc