Frederik Gladhorn f4900d340a Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1		2013-02-18 16:14:52 +01:00
..
externalsites	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
template	Doc: Added margin to the QML API description.	2013-02-15 17:48:36 +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
manifest-meta.qdocconf	Doc: Support for meta-content in manifest XML files	2013-02-15 17:48:36 +01:00
qt-cpp-ignore.qdocconf	Remove left-overs of QT_{BEGIN,END}_HEADERS	2013-01-31 20:08:58 +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: Support for meta-content in manifest XML files	2013-02-15 17:48:36 +01:00