Simon Hausmann b2603b7665 Merge remote-tracking branch 'origin/5.5' into HEAD ... Conflicts: src/plugins/platforms/windows/qwindowsopengltester.cpp Change-Id: Ia7abeba9395ccf84e2fa81b91a5725a86dedb9fe		2015-07-17 16:35:42 +02:00
..
images	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00
src	Merge remote-tracking branch 'origin/5.5' into HEAD	2015-07-17 16:35:42 +02:00
dropsite.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00
mousebuttons.qdoc	Update copyright headers	2015-02-11 06:49:51 +00:00