con 1c2da511b9 Merge remote branch 'origin/2.2' ...

Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h

2011-04-01 09:53:09 +02:00

..

api

API Documentation: Add VCSBase.

2011-03-28 14:19:17 +02:00

config

Fix Qt Creator version in documentation again.

2011-03-07 20:38:17 +01:00

doxygen

Fix wrong namespace.

2010-03-05 09:54:21 +01:00

examples

examples: fix some krazy warnings

2011-03-04 15:36:41 +01:00

images

Doc: specifying canvas size and refreshing the canvas

2011-03-29 16:18:42 +02:00

pluginhowto

coding style in example

2011-02-25 16:26:22 +01:00

snippets/qml

Updated the configuration files to use the updated qdoc.

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

templates

Doc: Attempted to fix table a header alignment problem.

2011-02-16 15:52:07 +01:00

addressbook-sdk.qdoc

fix spelling mistakes

2011-03-22 11:34:25 +01:00

classic.css

Silence doc warnings, apply new Qt docs layout, add CVS to RCSes.

2009-08-31 15:20:16 +02:00

doc.pri

Updated the configuration files to use the updated qdoc.

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

fixnavi.pl

fix fixing of navigation with multiple files

2010-12-08 16:28:52 +01:00

maemodev.qdoc

Merge remote branch 'origin/2.1'

2011-03-02 11:49:52 +01:00

qt.index

fix external doc references

2010-10-25 11:18:06 +02:00

qtcreator-online.qdocconf

Updated the configuration files to use the updated qdoc.

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

qtcreator.qdoc

Doc: fix qdoc tags

2011-03-29 16:52:54 +02:00

qtcreator.qdocconf

Updated the configuration files to use the updated qdoc.

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

runframework.dia

Initial import

2008-12-02 12:01:29 +01:00

symbiandev.qdoc

Doc: update version numbers

2011-03-23 17:16:03 +01:00