Lars Knoll 96232be146 Merge remote-tracking branch 'origin/api_changes' ... Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296		2012-03-04 21:45:05 +01:00
..
dom	Merge remote-tracking branch 'origin/api_changes'	2012-03-04 21:45:05 +01:00
sax	Merge remote-tracking branch 'origin/api_changes'	2012-03-04 21:45:05 +01:00
xml.pro	Revert "Put the generated <module>version.h into build tree"	2012-02-01 10:48:09 +01:00