Gunnar Sletta a9ac6da893 Merge branch 'master' into refactor ... Conflicts: src/3rdparty/v8 src/gui/text/qfont_qpa.cpp src/gui/widgets/qlinecontrol.cpp src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp tests/auto/gui.pro tests/auto/network.pro tests/auto/qstring/tst_qstring.cpp Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe		2011-09-12 07:49:03 +02:00
..
.gitignore	Moving relevant tests to corelib/global	2011-08-30 13:17:21 +02:00
qglobal.pro	Moving relevant tests to corelib/global	2011-08-30 13:17:21 +02:00
tst_qglobal.cpp	Merge branch 'master' into refactor	2011-09-12 07:49:03 +02:00