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
..
translations	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
i18n.pro	clean up example project files, mostly wrt QT+=widgets	2012-12-17 14:08:17 +01:00
i18n.qrc	Examples: move widgets specific "tools" examples to the correct place	2012-11-28 00:56:34 +01:00
languagechooser.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
languagechooser.h	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
main.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
mainwindow.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mainwindow.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00