Liang Qi d90b155c60 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: mkspecs/macx-ios-clang/features/resolve_config.prf src/testlib/qtestcase.qdoc Change-Id: Icefa63056ffb37106f35299a8f19165535571799		2016-10-17 11:02:54 +02:00
..
configure	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-17 11:02:54 +02:00
shared/windows	Updated license headers	2016-01-21 18:55:18 +00:00