Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
authorEero Hyyti <eero.hyyti@nokia.com>
Tue, 27 Sep 2011 05:49:10 +0000 (08:49 +0300)
committerEero Hyyti <eero.hyyti@nokia.com>
Tue, 27 Sep 2011 05:49:10 +0000 (08:49 +0300)
commitbe64a9c952fa127e66a7723ebd339fb629b6ab5f
tree3c037f87ef1b68eba653e4f9c0f85e59a7eba79c
parentcaf77de1ea1c15ae4dbeb8ea1182ec6226db210d
parentbafaaa85f77259e256581e4cba5d7afcda56a377
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging