Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
authorDavid Boddie <david.boddie@nokia.com>
Wed, 15 Dec 2010 17:25:07 +0000 (18:25 +0100)
committerDavid Boddie <david.boddie@nokia.com>
Wed, 15 Dec 2010 17:25:07 +0000 (18:25 +0100)
commit5da4cd2d40a5217e0db1d2c04b6a3e06d486cb36
tree52a2d7d3bedeb3da8727dfcd439cacc95b611c32
parent891d0c143b33c6e2e16af322652e4d7bccca2292
parent0c6780c39d18a4fd06b9bed94400de365a518c45
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7