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)
commita5947906d3aac7ec2f21a9621f7ad67a761a4560
treeb67a28ecfdf01a0ca71ec51e00ee45ee1491eeaf
parent962e99534d8955ae6c3c3524c5005f518b4e01bc
parent79f585b9e90c311f2c7b905426318d345b1bf641
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtmultimedia into newdocs

Change-Id: Idb607da32f80784d94556443be6740c6d7223411
src/multimedia/doc/qtmultimedia.qdocconf