Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
authorAndy Shaw <qt-info@nokia.com>
Mon, 21 Jun 2010 10:08:26 +0000 (12:08 +0200)
committerAndy Shaw <qt-info@nokia.com>
Mon, 21 Jun 2010 10:08:26 +0000 (12:08 +0200)
commit033fea2483945aa2ecb238751121098b594a1877
treef8a2b28e95640dab0e801037722e73b4633d0296
parent1fb24d6852e34bd58f35172dea4bfd4c41236689
parent448dd8593f3e7e680ce3d0f92e279aad3c88d7d6
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
src/gui/text/qtextdocument.cpp