Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorMartin Smith <martin.smith@nokia.com>
Wed, 13 Apr 2011 07:31:27 +0000 (09:31 +0200)
committerMartin Smith <martin.smith@nokia.com>
Wed, 13 Apr 2011 07:31:27 +0000 (09:31 +0200)
commitacaaa87b5ff35981d96a4ed9666f436822ccdb3f
tree49dc83038209f577e185f5d57dc58a0756814c95
parent16fe5d5b87ed1d819bf0791fabbd121481d62d22
parentab621c7092944f96886f973867d46db8cb38ede7
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7