Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
authorKevin Wright <kevin.wright@nokia.com>
Thu, 24 Nov 2011 16:31:36 +0000 (17:31 +0100)
committerKevin Wright <kevin.wright@nokia.com>
Thu, 24 Nov 2011 16:31:36 +0000 (17:31 +0100)
commit1e517bba5fa42a8e3c573966170399573ecf0ff0
tree58124a5f4b9940d1eb343706a15006f383b44a8a
parentdc04e391bde2ac545549ee2f546d165024253856
parent198d35b0bbdaefd60df37f74f28176a75804a861
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging