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
..
2013-09-17 18:55:55 +02:00
2014-04-14 06:45:43 +02:00
2014-04-14 06:45:43 +02:00
2014-06-16 13:43:05 +02:00
2014-07-08 13:49:56 +02:00
2014-06-14 21:59:24 +02:00
2014-07-17 18:58:00 +02:00
2014-04-14 06:45:43 +02:00
2013-01-10 17:56:01 +01:00
2014-04-14 06:45:43 +02:00
2014-09-01 12:52:51 +02:00
2013-07-30 11:44:43 +02:00