Lars Knoll d5098f2802 Merge remote-tracking branch 'origin/master' into api_changes ... Conflicts: tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7		2012-03-12 21:03:49 +01:00
..
configure	Merge remote-tracking branch 'origin/master' into api_changes	2012-03-12 21:03:49 +01:00
shared/windows	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00