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
..
images	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
arthurstyle.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
arthurstyle.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
arthurwidgets.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
arthurwidgets.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
hoverpoints.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
hoverpoints.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
shared.pri	Merge branch 'stable' into dev	2013-01-04 11:12:05 +01:00
shared.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
shared.qrc	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00