Eike Ziller c4e51e7405 Merge remote-tracking branch 'origin/3.2' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I926bdfc7df6158207cfc07f3c6c591d0a59b7667

2014-08-19 12:34:58 +02:00

..

api

Coding rules: Add guidelines for lambdas and auto

2014-07-07 09:51:25 +02:00

config

Doc: Remove non-existent path from .qdocconf

2014-08-14 15:48:33 +02:00

doxygen

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

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

examples

Doc: update Accelbubble example

2014-04-24 14:02:06 +02:00

images

Doc: new diff editor buttons

2014-08-11 10:45:20 +02:00

src

Merge remote-tracking branch 'origin/3.2'

2014-08-19 12:34:58 +02:00

templates

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

titlecase

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

doc.pri

fix building against non-installed qt5 shadow builds

2014-05-27 10:12:52 +02:00

fixnavi.pl

validate TOC references

2013-11-04 14:48:46 +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