Eike Ziller d719eebfdc Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/debugger/qml/qmlinspectoradapter.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/welcome/welcomeplugin.cpp

Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39

2012-11-30 17:02:35 +01:00

..

api

Copy plugins to correct user directory under Unix.

2012-11-29 10:45:58 +01:00

config

Doc: Making the header consistent with Qt reference documentation.

2012-10-23 12:23:52 +02:00

doxygen

Fix wrong namespace.

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

examples

Adjust license headers

2012-10-05 17:12:56 +02:00

images

Doc: update Valgrind menu names

2012-10-15 15:58:56 +02:00

snippets/qml

Doc: update information about creating buttons

2012-04-13 11:34:21 +02:00

src

Merge remote-tracking branch 'origin/2.6'

2012-11-27 11:50:56 +01:00

templates

Fix pixel issue with external link icons in footer.

2012-11-12 12:00:44 +01:00

titlecase

Doc:A script to transform sentences to Qt title case

2012-01-05 16:09:08 +01:00

addressbook-sdk.qdoc

Adjust license headers

2012-10-05 17:12:56 +02: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

Doc: Let 'make docs' also work without window manager

2012-10-18 17:24:10 +02:00

fixnavi.pl

make fixnavi deal with different conditions for prev/next links

2012-01-10 13:46:25 +01:00

qt.index

Doc: update automatically generated links to point to qt-project.org

2012-08-22 08:55:51 +02:00

qtcreator-online.qdocconf

Updated the configuration files to use the updated qdoc.

2011-02-11 08:40:55 +01: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