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-19 10:56:30 +01:00
2013-06-21 12:07:00 +02:00
2014-08-24 17:30:13 +02:00
2013-01-10 17:56:01 +01:00
2014-08-24 17:30:13 +02:00
2014-08-24 17:30:13 +02:00
2014-03-04 17:53:18 +01:00
2014-08-24 17:30:13 +02:00
2013-01-10 17:56:01 +01:00
2014-08-24 17:30:13 +02:00
2014-08-25 17:30:31 +02:00
2014-08-24 17:30:13 +02:00
2014-03-04 17:53:18 +01:00
2014-08-24 17:30:13 +02:00
2014-03-04 17:53:39 +01:00
2014-08-24 17:30:13 +02:00
2013-01-10 17:56:01 +01:00
2014-08-24 17:30:13 +02:00
2014-07-10 15:59:53 +02:00
2014-08-24 17:30:13 +02:00
2014-01-15 17:12:41 +01:00
2014-08-24 17:30:13 +02:00
2014-03-07 14:59:13 +01:00
2014-08-24 17:30:13 +02:00
2014-02-14 15:05:13 +01:00
2014-03-04 17:53:18 +01:00