Eike Ziller 11590a8c5f Merge remote-tracking branch 'origin/3.4' ...

Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.cpp

Change-Id: I09c5a047f7d91fecfc58c78df438afcdcdc0a8d7

2015-04-13 10:53:03 +02:00

..

api

Coding guidelines: Add various C++11 features

2015-04-10 14:21:02 +00:00

config

Doc: add a "commercial" icon to commercial-only topics

2015-04-08 10:45:50 +00:00

doxygen

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

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

examples

Update License

2015-01-16 12:37:56 +01:00

images

Doc: sidebar view context menus

2015-04-09 13:59:52 +00:00

src

Merge remote-tracking branch 'origin/3.4'

2015-04-13 10:53:03 +02:00

titlecase

Incremented year in copyright info

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

doc.pri

Doc: remove support for building docs with Qt 4

2014-11-24 09:48:26 +01:00

fixnavi.pl

validate TOC references

2013-11-04 14:48:46 +01:00

qtcreator-online.qdocconf

Update License

2015-01-16 12:37:56 +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