Simon Hausmann 8e2d3e3b90 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Change-Id: I9a10e1f3c9506ec8554d8f59b6300825ac730939		2016-03-23 08:29:43 +01:00
..
qmake.conf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-23 08:29:43 +01:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00