Liang Qi c7cdf3aac7 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/mimetypes/qmimeprovider.cpp src/corelib/mimetypes/qmimetype.cpp Change-Id: Ib483ddb6bfc380e7c8f195feca535703814c3872		2016-08-25 16:12:11 +02:00
..
qtconcurrentfilter	Updated license headers	2016-01-21 18:55:18 +00:00
qtconcurrentiteratekernel	Updated license headers	2016-01-21 18:55:18 +00:00
qtconcurrentmap	Updated license headers	2016-01-21 18:55:18 +00:00
qtconcurrentmedian	Updated license headers	2016-01-21 18:55:18 +00:00
qtconcurrentrun	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-25 16:12:11 +02:00
qtconcurrentthreadengine	Updated license headers	2016-01-21 18:55:18 +00:00
concurrent.pro	QtConcurrent: Workaround GCC bug 58800 in median calculation	2013-12-03 11:45:18 +01:00