Merge branch '4.3'
author Milian Wolff
()
committer Milian Wolff
()
commit 40d458bcc6fe3aca810b55207ff1088d3b813df6
tree e894edbde3528fdc3de115ef275707c816f0f312
parent af5f2ba5e0dca4333f64642d5bbe162f5413330d
parent 80ca810b10ecb89169b673314f6341736cae613b
Merge branch '4.3'

Conflicts:
formatters/customscript/kdevcustomscript.desktop
12 files changed:
debuggers/gdb/mi/miparser.cpp
debuggers/gdb/unittests/debugee.cpp
debuggers/gdb/unittests/debugeethreads.cpp
languages/cpp/CMakeLists.txt
languages/cpp/codecompletion/helpers.cpp
languages/cpp/codegen/signatureassistant.cpp
languages/cpp/codegen/simplerefactoring.cpp
languages/cpp/parser/parser.cpp
languages/cpp/parser/parser.h
languages/cpp/parser/tests/test_parser.cpp
languages/cpp/parser/tests/test_parser.h
projectmanagers/cmake/cmakemanager.cpp