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
..
configure	Merge branch 'master' into refactor	2011-09-12 07:49:03 +02:00
shared	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
uilib	Compile fix.	2011-09-01 10:55:44 +02:00