Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit
authorMichael Goddard <michael.goddard@nokia.com>
Tue, 30 Aug 2011 04:42:21 +0000 (14:42 +1000)
committerMichael Goddard <michael.goddard@nokia.com>
Tue, 30 Aug 2011 05:34:30 +0000 (15:34 +1000)
Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b

1  2 
src/plugins/gstreamer/gstreamer.pro

Simple merge