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
..
.gitignore
qdbuspendingreply.pro	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02:00
tst_qdbuspendingreply.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00