Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 30 Jun 2011 21:10:40 +0000 (07:10 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 30 Jun 2011 21:10:40 +0000 (07:10 +1000)
commit73f0d9534b593c65e4facf9a975e2c2e63608f03
tree78e51464f8f241a1df973aac110ddb4c0393c9d3
parent6b3f2a3b96d01dc339d07a076300d29616603b28
parentd795e50a2bf89209b124ec29fe7dd883208224ea
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Update 4.8.0 changes file