Frederik Gladhorn c8ca300e49 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a		2013-08-21 11:03:18 +02:00
..
externalsites	Merge remote-tracking branch 'origin/stable' into dev	2013-08-21 11:03:18 +02:00
template	Doc: Edited CSS files in doc/global/template	2013-07-23 16:30:06 +02:00
compat.qdocconf	Doc: Adding base macros and other QDoc definitions	2012-10-26 12:58:03 +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: Adding base macros and other QDoc definitions	2012-10-26 12:58:03 +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	Doc: ignore "Q_NORETURN" in function signatures.	2013-08-13 01:38:54 +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