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
..
codecs	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
completer	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
customcompleter	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
echoplugin	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
i18n	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
plugandpaint	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
plugandpaintplugins	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
regexp	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
settingseditor	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
styleplugin	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
treemodelcompleter	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
undo	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
undoframework	Merge branch 'release' into stable	2013-01-31 18:55:53 +01:00
tools.pro	Fix compile with -DQT_NO_TRANSLATION	2012-12-05 17:29:46 +01:00