con af44136e22 Merge remote branch 'origin/2.0' ...

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
	src/tools/qml/qmldump/main.cpp

2010-06-24 11:40:22 +02:00

..

api

Add some documentation for how to use the ProgressManager.

2009-12-02 15:05:49 +01:00

doxygen

Fix wrong namespace.

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

examples

Move the plugin examples to subdir of pluginhowto.

2010-06-21 17:32:15 +02:00

images

Doc - Add information about Remote Compiler. Add information about building for Symbian Emulator.

2010-06-16 11:41:59 +02:00

pluginhowto

Fix broken table.

2010-06-21 17:32:15 +02:00

templates

Ammendment to last commit, fix alignment of images in lists for good.

2010-06-22 11:09:03 +02:00

addressbook-sdk.qdoc

Changes made in Addressbook section and qdocconf file

2010-03-12 17:18:02 +01:00

classic.css

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

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

coding-style.qdoc

Merge remote branch 'origin/1.3'

2010-01-29 22:50:23 +01:00

doc.pri

Sync doc style with Qt, introduce online version (make docs_online)

2010-06-15 15:02:57 +02:00

fixnavi.pl

accept whitespace between \l and target

2010-01-05 18:32:32 +01:00

qt-defines.qdocconf

Doc - Add qtquick to defines to display Qt Quick information.

2010-06-24 09:56:05 +02:00

qt-html-templates.qdocconf

Merge remote branch 'origin/2.0'

2010-06-18 16:54:37 +02:00

qt.index

Qml: MouseRegion got renamed to MouseArea

2010-03-05 10:47:53 +01:00

qtcreator-online.qdocconf

Sync doc style with Qt, introduce online version (make docs_online)

2010-06-15 15:02:57 +02:00

qtcreator.qdoc

Merge remote branch 'origin/2.0'

2010-06-24 11:40:22 +02:00

qtcreator.qdocconf

Merge remote branch 'origin/2.0'

2010-06-24 11:40:22 +02:00

runframework.dia

Initial import

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