Sergio Ahumada f7837e28b5 Merge branch 'stable' into dev ... Conflicts: src/concurrent/qtconcurrentmedian.h src/corelib/itemmodels/qabstractitemmodel.cpp Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a		2013-09-13 18:04:17 +02:00
..
externalsites	Merge remote-tracking branch 'origin/stable' into dev	2013-08-21 11:03:18 +02:00
template	Doc: Changed CSS text-align from "justify" to "left".	2013-08-28 12:15:43 +02:00
compat.qdocconf	qdoc: Fix the qdoc \include command	2013-08-22 16:11:29 +02:00
config.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
fileextensions.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
html-config.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
html-footer.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
html-header-offline.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
html-header-online.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
macros.qdocconf	Doc: Reintroduce \beginqdoc and \endqdoc macros	2013-09-10 11:14:28 +02:00
manifest-meta.qdocconf	Doc: Updated the tagged examples list for Android	2013-08-14 17:14:56 +02:00
qt-cpp-defines.qdocconf	qdoc: Ignore QT_MUTEX_LOCK_NOEXCEPT macros	2013-09-09 10:40:37 +02:00
qt-html-templates-offline.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
qt-html-templates-online.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
qt-module-defaults-offline.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
qt-module-defaults-online.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
qt-module-defaults.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00