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
..
mac	Clean up default arch setting on Mac OS X	2012-02-17 11:44:29 +01:00
qpa	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
unix	Merge remote-tracking branch 'origin/api_changes'	2012-03-04 21:45:05 +01:00
x11	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00