CMakeLists.txt
5.62 KB
-
Merge remote-tracking branch 'origin/development' into mtapi_distributed · 7ee71b96
Conflicts: mtapi_c/src/embb_mtapi_task_t.c mtapi_c/test/main.cc
Marcus Winter committed
Conflicts: mtapi_c/src/embb_mtapi_task_t.c mtapi_c/test/main.cc