Frederik Gladhorn e65cd6f379 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629		2013-02-14 14:24:57 +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.qrc	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00