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	Remove automated generation of dwarf index	2014-02-16 15:41:30 +01:00
qplatformdefs.h	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00