forked from qt-creator/qt-creator
Conflicts: src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp Change-Id: I722a94f37bdd1d78625cfae503ba6d02ff083c63
48 KiB
48 KiB
Conflicts: src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp Change-Id: I722a94f37bdd1d78625cfae503ba6d02ff083c63