João Abecasis d065dfd454 Merge remote-tracking branch 'gerrit/master' into containers ... Conflicts: src/corelib/tools/qstring.cpp Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb		2012-02-05 21:26:33 +01:00
..
codecs	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
io	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
json	tests: do not run benchmarks by default in 'make check'	2012-02-02 09:27:25 +01:00
kernel	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
plugin	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
thread	Remove Symbian specific code from qtbase.	2012-01-31 07:08:31 +01:00
tools	Merge remote-tracking branch 'gerrit/master' into containers	2012-02-05 21:26:33 +01:00
corelib.pro	Import json support from playground/qtbinaryjson	2012-01-24 15:28:20 +01:00