Sergio Ahumada 3ef6cf060e Merge branch 'stable' into dev ... Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f		2013-07-11 16:42:01 +02:00
..
integrity	merge string literals	2013-07-04 18:13:18 +02:00
mac	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
unix	merge string literals	2013-07-04 18:13:18 +02:00
win32	MANIFEST:NO is not written to vcproj	2013-07-05 11:36:22 +02:00
makefile.cpp	Merge branch 'stable' into dev	2013-07-11 16:42:01 +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