Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 20 Dec 2010 04:23:26 +0000 (14:23 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 20 Dec 2010 04:23:26 +0000 (14:23 +1000)
commitefdd9e8949bb6cb88a087f02f81d6d8ef18a08d1
treefd6c5fef672d9775b279b316fdd462c4c865cd5d
parente68210d2086fbdc8252298f8d7781bf84f73b6ab
parent6842743be8ad2403094e74e0cf70c9a6a325c4b2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  embed copyright information in QtAssistantClient4.dll