Frederik Gladhorn 49a2ec05b4 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/qnx/qqnxscreen.cpp src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: Ib64f21c077b54f2291d19187590bfe869b98477a		2013-03-06 14:38:07 +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	Doc: fixed snippet issues with customcompleter.qdoc	2013-03-05 17:55:14 +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