CMakeLists.txt
1.43 KB
-
Merge remote-tracking branch 'origin/development' into mtapi_distributed · 0f1ae441
Conflicts: CMakeLists.txt doc/examples/CMakeLists.txt doc/tutorial/content/mtapi.tex
Marcus Winter committed
Conflicts: CMakeLists.txt doc/examples/CMakeLists.txt doc/tutorial/content/mtapi.tex