qt5base-lts/examples/widgets/tools
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
..
codecs Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
completer Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
customcompleter Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
echoplugin Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
i18n Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
plugandpaint Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
plugandpaintplugins Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
regexp Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
settingseditor Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
styleplugin Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
treemodelcompleter Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
undo Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
undoframework Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
tools.pro Fix compile with -DQT_NO_TRANSLATION 2012-12-05 17:29:46 +01:00