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
..
qeglfshooks_surfaceflinger.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qmake.conf	Android-eglfs: Fixed build against Android 4.0.x	2013-01-21 09:20:01 +01:00
qplatformdefs.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00