Oswald Buddenhagen c2e90c360b Merge remote-tracking branch 'origin/2.8' ...

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48

2013-08-21 14:39:18 +02:00

..

api

Doc: location of generated help files

2013-07-26 13:47:34 +02:00

config

Merge remote-tracking branch 'origin/2.8'

2013-06-25 10:14:14 +02:00

doxygen

Replace com.nokia.qtcreator with org.qt-project.qtcreator

2013-02-07 12:40:37 +01:00

examples

Doc: fixed issues in the Qt Quick app tutorial

2013-06-13 17:41:40 +02:00

images

Merge remote-tracking branch 'origin/2.8'

2013-08-21 14:39:18 +02:00

snippets

Doc: tutorial for developing an Android app

2013-08-02 14:42:59 +02:00

src

Merge remote-tracking branch 'origin/2.8'

2013-08-21 14:39:18 +02:00

templates

PNG: Fix warning about sRGB information

2013-05-27 16:12:01 +02:00

titlecase

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

addressbook-sdk.qdoc

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

doc.pri

Add documentation for extensions of Qml Performance Monitor

2013-06-20 14:52:37 +02:00

fixnavi.pl

adapt fixnavi to \o => \li change

2013-02-28 16:49:46 +01:00

qt.index

Remove Qt 4.8 index.html from qt.index.

2012-12-17 13:57:24 +01:00

qtcreator-online-qt4.qdocconf

use qt's qdoc templates when building against qt5

2013-02-15 11:35:22 +01:00

qtcreator-online.qdocconf

use qt's qdoc templates when building against qt5

2013-02-15 11:35:22 +01:00

qtcreator-qt4.qdocconf

use qt's qdoc templates when building against qt5

2013-02-15 11:35:22 +01:00

qtcreator.qdocconf

use qt's qdoc templates when building against qt5

2013-02-15 11:35:22 +01:00

runframework.dia

Initial import

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