Eike Ziller 851f255b9d Merge remote-tracking branch 'origin/3.0' ...

Conflicts:
	src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.cpp

Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352

2014-01-15 14:04:41 +01:00

..

api

Core: Merge Find and Locator into Core plugin

2014-01-14 07:43:00 +01:00

config

Incremented year in copyright info

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

doxygen

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

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

examples

Incremented year in copyright info

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

images

Doc: using modifiers for snippet variable values

2014-01-10 16:41:20 +01:00

snippets/qml

Doc: update the Android tutorial

2013-10-29 15:22:17 +01:00

src

Merge remote-tracking branch 'origin/3.0'

2014-01-15 14:04:41 +01: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

addressbook-sdk.qdoc

Incremented year in copyright info

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

doc.pri

Add documentation for extensions of Qml Performance Monitor

2013-06-20 14:52:37 +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