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, 3 Nov 2010 02:47:22 +0000 (03:47 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 3 Nov 2010 02:47:22 +0000 (03:47 +0100)
commit69ab0cd2b51a86fe27c92c7c18390f6791939b53
tree688a1645be86519ef1504d21b525cd842cf67d0b
parent8e2b95b1115bc07f81d0fa22cc2929bb28d3e9bb
parent7c8edecd486b71ff84cfaf278d9b1295e24766b9
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:
  make the dtd reflect reality
  Fixed destination path for the S60 feedback plugin.
  german translation: minor additions + fixes
  fix qdoc doc generation