Frederik Gladhorn
659f238bbb
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/gsttools/qgstreamervideoinputdevicecontrol.cpp
src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
2014-09-01 12:52:51 +02:00
..
2014-08-24 17:30:13 +02:00
2014-03-03 14:55:17 +01:00
2014-08-24 17:30:13 +02:00
2014-08-24 17:30:13 +02:00
2014-08-24 17:30:13 +02:00
2014-08-24 17:30:13 +02:00
2014-08-24 17:30:13 +02:00
2014-08-24 17:30:13 +02:00
2014-08-24 17:30:13 +02:00
2014-08-18 15:07:47 +02:00
2014-08-24 17:30:13 +02:00
2014-08-24 17:30:13 +02:00
2014-08-24 17:30:13 +02:00
2014-08-24 17:30:13 +02:00
2014-08-24 17:30:13 +02:00
2014-09-01 12:52:51 +02:00
2014-08-24 17:30:13 +02:00
2014-08-24 17:30:13 +02:00