Frederik Gladhorn 39bb642cb2 Merge remote-tracking branch 'origin/5.4' into 5.5 ...

Conflicts:
	qtmultimedia.pro
	src/gsttools/qgstreamervideowidget.cpp
	src/plugins/gstreamer/camerabin/camerabinservice.cpp

Change-Id: I883f20dc17924ab42514a1aa00d16675a0f13d99

2015-02-24 17:38:46 +01:00

1.0 KiB

Raw Blame History

View Raw