Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 20 Sep 2011 06:26:28 +0000 (16:26 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 20 Sep 2011 06:26:28 +0000 (16:26 +1000)
commit5243b9eaf3deb201f23b2710c274e3108a4eb23b
tree87376436826769d37469bb89002a867bc54f855d
parent367a89cf5cb1282d2e966c83869a56fd22745779
parente037eb6dd00e51195380dd68af2c6a0466977529
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  add 4.8 changes created/merged by me
  Update changelog for Qt 4.8.0