Eike Ziller 56aadc407d Merge remote-tracking branch 'origin/3.3' ...

Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602

2015-02-12 17:36:29 +01:00

..

examples

ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files

2014-09-02 15:11:24 +02:00

images

Doc: fix changed UI string in docs and update screenshot

2014-12-17 17:11:33 +01:00

coding-style.qdoc

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

creating-plugins.qdoc

Update License

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

external-tool-spec.qdoc

Update License

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

first-plugin.qdoc

Update License

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

getting-and-building.qdoc

Update License

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

plugin-lifecycle.qdoc

Update License

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

plugin-metadata.qdoc

Update License

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

pluginmanager.qdoc

Update License

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

qtcreator-api.qdoc

Update License

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

qtcreator-dev-online.qdocconf

use qt's qdoc templates when building against qt5

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

qtcreator-dev-wizards.qdoc

Update License

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

qtcreator-dev.qdoc

Update License

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

qtcreator-dev.qdocconf

use qt's qdoc templates when building against qt5

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

qtcreator-documentation.qdoc

Doc: fix bug in doc building instructions

2015-01-29 13:15:59 +00:00

qtcreator-ui-text.qdoc

Update License

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