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
..
animation	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
desktop	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
dialogs	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
doc	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
draganddrop	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
effects	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
graphicsview	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
itemviews	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
layouts	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mainwindows	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
painting	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
richtext	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
scroller	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
statemachine	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
tutorials	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
windowcontainer	Introducing QWidget::createWindowContainer()	2013-01-25 14:11:07 +01:00
widgets.pro	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00