Frederik Gladhorn c608ec8254 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/io/qsavefile_p.h src/corelib/tools/qregularexpression.cpp src/gui/util/qvalidator.cpp src/gui/util/qvalidator.h Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825		2013-01-22 18:40:13 +01:00
..
animation	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
codecs	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
global	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
io	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
itemmodels	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
json	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
kernel	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mimetypes	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
plugin	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
statemachine	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
thread	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
xml	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
corelib.pro	Import QMimeType / QMimeDatabase into QtCore.	2012-02-18 22:19:43 +01:00