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
..
integrity	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
mac	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
symbian	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
unix	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
win32	qmake vcxproj generator: fix XML conversion for build events	2011-09-08 19:50:28 +02:00
makefile.cpp	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
makefile.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
makefiledeps.cpp	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
makefiledeps.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
metamakefile.cpp	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
metamakefile.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
projectgenerator.cpp	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
projectgenerator.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
xmloutput.cpp	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00
xmloutput.h	Update licenseheader text in source files for qtbase Qt module	2011-05-24 12:34:08 +03:00