Frederik Gladhorn 9785766067 Merge remote-tracking branch 'origin/stable' into dev ...

Conflicts:
	.qmake.conf
	sync.profile

Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4

2013-06-04 19:50:11 +02:00

..

audioengine

Update qmldir file for QtAudioEngine

2013-05-27 14:27:32 +02:00

multimedia

Merge remote-tracking branch 'origin/stable' into dev

2013-06-04 19:50:11 +02:00

imports.pro

switch to new-style configure tests

2012-06-25 10:40:03 +02:00