Frederik Gladhorn 6bf6c12854 Merge remote-tracking branch 'origin/release' into stable ... Change-Id: Iaa321deb9e536ce89b87a337b57634f00c770a32		2013-01-22 18:32:47 +01:00
..
externalsites	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
template	Doc CSS: Edited CSS line-height of paragraphs and landing page.	2012-12-11 16:27:14 +01:00
compat.qdocconf	Doc: Adding base macros and other QDoc definitions	2012-10-26 12:58:03 +02:00
macros.qdocconf	Doc: Adding base macros and other QDoc definitions	2012-10-26 12:58:03 +02:00
qt-cpp-ignore.qdocconf	Doc: Placed missing '\'	2012-11-07 13:18:00 +01:00
qt-defines.qdocconf	Doc: Integrated ignoretokens and ignoredirectives from Qt Multimedia.	2012-11-07 12:45:39 +01:00
qt-html-templates-offline.qdocconf	Doc: Updated HTML copyright year to 2013.	2013-01-22 14:43:14 +01:00
qt-html-templates-online.qdocconf	Doc: Updated HTML copyright year to 2013.	2013-01-22 14:43:14 +01:00
qt-module-defaults-online.qdocconf	Doc: Updated HTML copyright year to 2013.	2013-01-22 14:43:14 +01:00
qt-module-defaults.qdocconf	Doc: Updated HTML copyright year to 2013.	2013-01-22 14:43:14 +01:00