hjk 5805788290 Merge remote branch 'origin/2.0' ...

Conflicts:
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
	src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
	tests/manual/gdbdebugger/simple/app.cpp

2010-05-27 11:11:53 +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

Doc: Updated example license to three clause BSD license.

2010-05-25 18:47:15 +02:00

images

Doc - Updated screen shot.

2010-05-21 12:22:11 +02:00

templates

Applying the new layout (slightly modified) to the Qt Creator docs.

2010-05-04 16:16:47 +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

escape backslashes (or don't use them at all, resp.)

2010-05-26 19:35:21 +02:00

fixnavi.pl

accept whitespace between \l and target

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

qt-defines.qdocconf

Applying the new layout (slightly modified) to the Qt Creator docs.

2010-05-04 16:16:47 +02:00

qt-html-templates.qdocconf

Applying the new layout (slightly modified) to the Qt Creator docs.

2010-05-04 16:16:47 +02:00

qt.index

Qml: MouseRegion got renamed to MouseArea

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

qtcreator.qdoc

Merge remote branch 'origin/2.0'

2010-05-21 16:04:27 +02:00

qtcreator.qdocconf

Merge remote branch 'origin/2.0'

2010-05-21 16:04:27 +02:00

runframework.dia

Initial import

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