Liang Qi 8e20daae9f Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/plugins/platforms/minimalegl/qminimaleglintegration.cpp Change-Id: Ia6ab42a6daadbf8abc085c971545904d49ea4b56		2016-10-31 09:26:35 +01:00
..
configure	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-31 09:26:35 +01:00
shared/windows	Updated license headers	2016-01-21 18:55:18 +00:00