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

Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/3rdparty/botan/botan.qbs
	src/libs/ssh/ssh.qbs
	src/plugins/qnx/blackberryqtversion.cpp

Change-Id: Ie8d16d636528aab4006310eab47a342fdf2634d9

2012-10-18 10:40:11 +02:00

..

api

More Nokia -> Digia/QtProject changes

2012-10-09 12:24:24 +02:00

config

More Nokia -> Digia/QtProject changes

2012-10-09 12:24:24 +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-10-18 10:40:11 +02:00

templates

Doc: fix a link to the doc server in the CSS

2012-10-16 16:48:31 +02: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

Introduce $$QTC_PREFIX

2012-09-25 10:14:51 +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