Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
authorSimon Hausmann <simon.hausmann@nokia.com>
Wed, 16 Jun 2010 20:59:37 +0000 (22:59 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Wed, 16 Jun 2010 20:59:37 +0000 (22:59 +0200)
commitf5a7dcc2fc7a5340e13925bf46ff8aaf4da4b0d3
treecfef52067762aaf362cd4bc94034edd0290e539b
parent30c8d1e3dccc83499ac3d76284cfb2e8d860808a
parent600a19ab7cecc32a3b31c873900303005fb3d672
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6

Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
examples/multimedia/audioinput/audioinput.cpp