Frederik Gladhorn 2eb26c1709 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/gui/text/qfontdatabase.cpp Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d		2014-10-27 13:00:36 +01:00
..
integrity	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
mac	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
unix	Merge remote-tracking branch 'origin/5.3' into 5.4	2014-10-06 11:59:47 +02:00
win32	Merge remote-tracking branch 'origin/5.4' into dev	2014-10-27 13:00:36 +01:00
makefile.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
makefile.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
makefiledeps.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
makefiledeps.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
metamakefile.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
metamakefile.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
projectgenerator.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
projectgenerator.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
xmloutput.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
xmloutput.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00