-
Eike Ziller authored
Conflicts: src/plugins/clangcodemodel/test/clangcompletion_test.cpp src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp src/plugins/projectexplorer/projectexplorer.pro src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp src/plugins/vcsbase/vcsplugin.cpp src/shared/qbs Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
6d1cc586