Eike Ziller 57ae91c5ef Merge remote-tracking branch 'origin/2.3' ...

Conflicts:
	doc/qtcreator.qdoc
	qtcreator.pri

Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472

2011-08-30 15:59:07 +02:00

..

compat.qdocconf

Updated the configuration files to use the updated qdoc.

2011-02-11 08:40:55 +01:00

macros.qdocconf

Doc: change SDK name

2011-03-07 14:24:51 +01:00

qt-cpp-ignore.qdocconf

Updated the configuration files to use the updated qdoc.

2011-02-11 08:40:55 +01:00

qt-defines.qdocconf

Updated the configuration files to use the updated qdoc.

2011-02-11 08:40:55 +01:00

qt-html-default-styles.qdocconf

Updated the configuration files to use the updated qdoc.

2011-02-11 08:40:55 +01:00

qt-html-online-styles.qdocconf

Doc: Added a missing image, removed unnecessary search field.

2011-02-16 18:38:16 +01:00

qt-html-templates-online.qdocconf

Merge remote-tracking branch 'origin/2.3'

2011-08-30 15:59:07 +02:00

qt-html-templates.qdocconf

Doc: add version numbers to the doc titles

2011-06-23 10:51:24 +02:00

qtcreator-developer.qdocconf

fix shadow building of apidocs

2011-06-01 11:51:27 +02:00

qtcreator-project.qdocconf

Doc: generic Linux device target

2011-07-08 12:13:14 +02:00