Oswald Buddenhagen f1cec4629e Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b

2013-01-29 15:52:36 +01:00

..

api

CodingStyle: Recommend space after //

2013-01-14 17:57:37 +01:00

config

Doc: fix missing snippets

2013-01-23 12:42:07 +01: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: deployment settings for generic Linux devices

2013-01-24 10:52:36 +01: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'

2013-01-29 15:52:36 +01:00

templates

Fix pixel issue with external link icons in footer.

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

titlecase

Remove unused classic.css

2012-12-08 18:32:37 +01:00

addressbook-sdk.qdoc

Adjust license headers

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

Remove Qt 4.8 index.html from qt.index.

2012-12-17 13:57:24 +01: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