Oswald Buddenhagen 5a7d3e78db Merge remote-tracking branch 'origin/3.6' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ifbe181e86c161e082cc9a69a4bc7bd399f34ff47

2016-01-04 14:11:07 +01:00

..

echoserver

Clang: Integrate highlighting results from backend

2015-11-26 15:19:27 +00:00

mockup

Clang: Use line and column instead of offset for diagnostics

2015-12-07 11:10:05 +00:00

unittest

Merge remote-tracking branch 'origin/3.6'

2016-01-04 14:11:07 +01:00

unit.pro

Clang: Rename CodeModelBackEnd in ClangBackEnd

2015-06-16 13:29:27 +00:00