Frederik Gladhorn 7c495cfea9 Merge remote-tracking branch 'origin/5.3' into dev ... Conflicts: src/gui/text/qfontengine_qpf2.cpp Change-Id: Ib04f92c41d0edd55d3aef8fb1708d917fba0f2a8		2014-07-14 10:35:51 +02:00
..
snippets	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
src	Doc: Fix typos	2014-03-27 15:36:58 +01:00
qtxml.qdocconf	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-14 10:35:51 +02:00