Eike Ziller 5432dd1f5c Merge remote-tracking branch 'origin/4.6' ...

Conflicts:
	src/plugins/coreplugin/locator/locator.cpp
	src/plugins/imageviewer/imageviewerplugin.cpp
	src/plugins/remotelinux/remotelinuxplugin.cpp
	src/tools/clangbackend/source/tokeninfo.cpp
	tests/unit/unittest/data/highlightingmarks.cpp

Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67

2018-02-07 11:58:23 +01:00

24 KiB

Raw Blame History

View Raw