-
Eike Ziller authored
Conflicts: src/plugins/projectexplorer/devicesupport/devicemanager.cpp Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
Eike Ziller authoredConflicts: src/plugins/projectexplorer/devicesupport/devicemanager.cpp Change-Id: I1d46128f530428315e7ab5d52c8115036371487f