Eike Ziller 6e8ee7479e Merge remote-tracking branch 'origin/4.3' ...

Conflicts:
	src/plugins/debugger/cdb/cdbengine.cpp

Change-Id: Ib9aeccc4162c43e9ee3d85847d96678045625dd0

2017-05-09 15:07:30 +02:00

..

creator-beautifier.qdoc

Beautifier: added support for fallback-style option for clang-format

2017-03-29 08:35:24 +00:00

creator-clang-codemodel.qdoc

ClangCodeModel: Make DisabledByDefault instead of Experimental

2016-12-16 08:56:32 +00:00

creator-coding-edit-mode.qdoc

Doc: Describe setting parse context

2017-04-20 12:12:38 +00:00

creator-coding.qdoc

Doc: Add docs for SCXML Editor

2016-10-06 14:05:26 +00:00

creator-diff-editor.qdoc

Doc: -1 is no longer supported in Diff Editor options

2016-12-01 10:21:01 +00:00

creator-editors-options-text.qdoc

Update License according to agreement with Free Qt Foundation

2016-01-19 13:09:03 +00:00

creator-editors-options.qdoc

Update License according to agreement with Free Qt Foundation

2016-01-19 13:09:03 +00:00

creator-editors-writing-code.qdoc

ClangCodeModel: Make DisabledByDefault instead of Experimental

2016-12-16 08:56:32 +00:00

creator-editors.qdoc

Doc: Describe the experimental Clang Refactoring plugin

2017-05-09 11:29:47 +00:00

creator-finding.qdoc

Update License according to agreement with Free Qt Foundation

2016-01-19 13:09:03 +00:00

creator-mime-types.qdoc

Update License according to agreement with Free Qt Foundation

2016-01-19 13:09:03 +00:00

creator-modeling.qdoc

Doc: Describe Model Editor zooming commands

2016-12-01 08:55:54 +00:00

creator-scxml.qdoc

Doc: Fix icon filename from icon-pan.png to pan.png

2017-02-01 09:14:03 +00:00