Frederik Gladhorn 49a2ec05b4 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/qnx/qqnxscreen.cpp src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: Ib64f21c077b54f2291d19187590bfe869b98477a		2013-03-06 14:38:07 +01:00
..
integrity	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mac	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
unix	introduce QMAKE_LINK_O_FLAG	2013-03-02 10:45:54 +01:00
win32	Merge remote-tracking branch 'origin/stable' into dev	2013-03-06 14:38:07 +01:00
makefile.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
makefile.h	consolidate generation of metafile install targets	2013-01-25 23:30:50 +01:00
makefiledeps.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
makefiledeps.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
metamakefile.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
metamakefile.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +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	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
xmloutput.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00