Files
qtmultimedia/src/multimedia
Yoann Lopes af2d5a181c Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
	.qmake.conf
	src/plugins/gstreamer/camerabin/camerabinsession.cpp

Change-Id: I66a6f3efc5391013934b6b321073c31f25e1de26
2015-01-19 14:45:09 +01:00
..
2014-11-25 09:49:24 +01:00
2015-01-13 13:34:41 +01:00
2014-11-27 23:30:05 +01:00
2014-11-27 23:30:05 +01:00