forked from qt-creator/qt-creator
Conflicts: src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp src/plugins/debugger/gdb/gdboptionspage.cpp Change-Id: I4149e860b6842ea63bff3a7eb9632b7a6c2919d8
Conflicts: src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp src/plugins/debugger/gdb/gdboptionspage.cpp Change-Id: I4149e860b6842ea63bff3a7eb9632b7a6c2919d8