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
..
arch	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
common	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mac	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qpa	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
unix	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
x11	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00