Files
qtmultimedia/config.tests
Frederik Gladhorn 74e4b59ec8 Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
	src/plugins/plugins.pro

Change-Id: Ieec8b5984b0fba97872bf96c38410369dc0e20cf
2013-08-12 12:47:02 +02:00
..
2013-07-19 09:42:19 +02:00