Frederik Gladhorn 72e5124b85 Merge remote-tracking branch 'origin/release' into stable ... Conflicts: tests/auto/opengl/qgl/tst_qgl.cpp Change-Id: I3c601351c984c1f4b00478d3c47ac9eeb021e892		2013-03-08 16:11:33 +01:00
..
integrity	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mac	Fix generation of XCode projects for XCode 4.6	2013-02-27 12:01:28 +01:00
unix	consolidate generation of metafile install targets	2013-01-25 23:30:50 +01:00
win32	define NDEBUG in MSVC/nmake release builds	2013-03-01 13:05:11 +01:00
makefile.cpp	Fix generated pkg-config files when cross-compiling	2013-02-20 12:59:55 +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	remove some cryptic code relating to output directories	2013-03-07 00:42:56 +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	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