Files
qt-creator/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
Eike Ziller b213c87cf4 Merge remote-tracking branch 'origin/4.15'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

Change-Id: I722a94f37bdd1d78625cfae503ba6d02ff083c63
2021-03-25 11:06:59 +01:00

48 KiB