-
Oswald Buddenhagen authored
Conflicts: src/plugins/projectexplorer/toolchainmanager.cpp src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp Change-Id: Id736c6922670c921c689219cb817b1541eaaf304
100ea30a
Conflicts: src/plugins/projectexplorer/toolchainmanager.cpp src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp Change-Id: Id736c6922670c921c689219cb817b1541eaaf304