Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Thu, 4 Nov 2010 12:33:02 +0000 (13:33 +0100)
committerDavid Boddie <david.boddie@nokia.com>
Thu, 4 Nov 2010 12:33:02 +0000 (13:33 +0100)
commit88d3ebb42ebc94d4c2da3afa9f1b9c4ecd52abb3
tree2cf996684915a513475bca712a7473bc9e8bc843
parent828003fb654f33de52585883ed5e7441f925af75
parent5549cd45e319e3019e2aac64a2143977f860e883
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7