Frederik Gladhorn e2776b44a0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb		2013-06-12 19:17:07 +02:00
..
integrity	fix license headers	2013-05-30 12:16:49 +02:00
mac	Merge remote-tracking branch 'origin/stable' into dev	2013-06-12 19:17:07 +02:00
unix	Android: Backslash workarounds for Unix Makefile generator	2013-04-10 17:51:36 +02:00
win32	Changed project dependencies for solution files	2013-06-05 08:45:07 +02:00
makefile.cpp	qmake: do not write timestamps to generated Makefiles	2013-04-16 17:43:44 +02:00
makefile.h	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
makefiledeps.cpp	Fix leak when fd != -1	2013-03-23 14:42:45 +01:00
makefiledeps.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
metamakefile.cpp	actually use the temp variable we just assigned ...	2013-03-12 18:54:59 +01:00
metamakefile.h	remove some cryptic code relating to output directories	2013-03-07 00:42:56 +01:00
projectgenerator.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
projectgenerator.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
xmloutput.cpp	remove pointless QString::arg call	2013-05-30 12:16:52 +02:00
xmloutput.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00