src/plugins/clangcodemodel/clangassistproposalmodel.cpp · 98257617e96917a328cdf7b72c6cdfb12e0d3394 · Tobias Hunger / qt-creator

Merge remote-tracking branch 'origin/3.6' · 98257617

Eike Ziller authored Jan 19, 2016

 Conflicts:
	src/plugins/clangcodemodel/clangassistproposalmodel.cpp
	src/plugins/clangcodemodel/clangassistproposalmodel.h

Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715

98257617