Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtmultimedia into newdocs
authorJerome Pasion <jerome.pasion@digia.com>
Fri, 2 Nov 2012 14:40:51 +0000 (15:40 +0100)
committerJerome Pasion <jerome.pasion@digia.com>
Fri, 2 Nov 2012 14:41:00 +0000 (15:41 +0100)
Change-Id: Idb607da32f80784d94556443be6740c6d7223411

1  2 
src/multimedia/doc/qtmultimedia.qdocconf