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
..
images	Re-add systray.qdoc and images.	2015-09-11 07:47:31 +00:00
src	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-31 09:26:35 +01:00
dropsite.qdoc	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
mousebuttons.qdoc	Unify license header usage.	2016-03-29 10:20:03 +00:00