Yoann Lopes a2244c9b7a Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
	src/imports/multimedia/qdeclarativeaudio.cpp

Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
2015-08-24 14:36:13 +02:00
2015-02-12 10:27:47 +00:00
2015-06-11 16:14:37 +00:00
2015-06-29 10:47:53 +02:00
2012-09-03 19:53:28 +02:00
2015-02-12 10:27:47 +00:00
2015-08-13 15:07:55 +02:00
2015-08-13 15:07:55 +02:00
2015-02-12 10:27:47 +00:00
Description
No description provided
17 MiB
Languages
C++ 90.5%
Objective-C++ 5.8%
QMake 1%
Objective-C 0.9%
QML 0.5%
Other 1%