Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 18 May 2011 08:25:24 +0000 (18:25 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 18 May 2011 08:25:24 +0000 (18:25 +1000)
commitb7be5ff78bb45ed6c0a24fc0f9398c581382d9a0
tree38014399b30dde9b4f9ecd2bedd6e8e9bbba3fff
parent5e38a334b1ef46a932c8aff65a7d448b5c7df853
parent54c59e3a0904205d39b8f205f343742ea9a910c3
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Re-apply licenseheader text in source files for qt4.7