Frederik Gladhorn dbafabb019 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h Change-Id: I03d8b6e07135056baaa1d97c3c63fbe8b25583d9		2014-02-17 11:39:16 +01:00
..
qmake.conf	Merge remote-tracking branch 'origin/stable' into dev	2014-02-17 11:39:16 +01:00
qplatformdefs.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00