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
..
accessibilityinspector	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
aglfn	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
corelib/qurl-generateTLDs	QUrl effective TLDs: update table and split into chunks of 64K	2013-02-09 10:12:44 +01:00
harfbuzz	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
integrity	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
lexgen	Nokia -> Qt Project	2013-02-05 20:53:57 +01:00
local_database	Fix minor typos in docs, printed messages & comments	2013-01-28 18:12:41 +01:00
plugintest	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
scripts	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
unicode	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
xkbdatagen	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00