Liang Qi c4e472ea10 Merge remote-tracking branch 'origin/5.7.0' into 5.7 ... Conflicts: src/corelib/tools/qsimd_p.h Change-Id: I7c6bfc5873d97ad7f51a540dd9c18b9359dde59f		2016-06-16 07:30:02 +02:00
..
configure	Merge remote-tracking branch 'origin/5.7.0' into 5.7	2016-06-16 07:30:02 +02:00
shared/windows	Updated license headers	2016-01-21 18:55:18 +00:00