Eike Ziller 428fcb476b Merge remote-tracking branch 'origin/4.6' ...

Conflicts:
	src/libs/utils/settingsaccessor.cpp
	src/plugins/autotest/autotestplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.h

Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f

2018-04-13 10:54:42 +02:00

152 KiB

Raw Blame History

View Raw