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

Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80

2012-12-18 17:42:04 +01:00

..

api

Remove unused classic.css

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

config

Avoid pulling in "Extending Manual" into Qt Creator manual.

2012-12-17 12:47:49 +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: remove references to Qt Quick example

2012-12-17 15:06:15 +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'

2012-12-18 17:42:04 +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