forked from qt-creator/qt-creator
Conflicts: src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp Change-Id: I7a2cfa35b5bc9070c66561bfba3e4b5a8e26917f
96 KiB
96 KiB
Conflicts: src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp Change-Id: I7a2cfa35b5bc9070c66561bfba3e4b5a8e26917f