Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4...
authorToby Tomkins <toby.tomkins@nokia.com>
Tue, 6 Apr 2010 03:48:07 +0000 (13:48 +1000)
committerToby Tomkins <toby.tomkins@nokia.com>
Tue, 6 Apr 2010 03:48:07 +0000 (13:48 +1000)
commit281d95827bdce97727ed56049bd4afbac917ee91
tree59ecacb7f935494ee9df845637bc40e145c2143a
parent5f377ecf7a473094908f9355b4c22fdcbd83c0d5
parentbc190d195a20d5e87547e27265df2ce9668ab545
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-multimedia