Kent Hansen 95d6f8a4cf Merge master into api_changes ... Conflicts: src/corelib/tools/qvector.h tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6		2012-03-19 10:03:48 +01:00
..
configure	Merge master into api_changes	2012-03-19 10:03:48 +01:00
shared/windows	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00