-
Eike Ziller authored
Conflicts: src/plugins/clangcodemodel/clangassistproposalmodel.cpp src/plugins/clangcodemodel/clangassistproposalmodel.h Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715
98257617
Conflicts: src/plugins/clangcodemodel/clangassistproposalmodel.cpp src/plugins/clangcodemodel/clangassistproposalmodel.h Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715