Merge branch 'master' into shape_matching_integration

This commit is contained in:
Joachim Burket
2020-06-30 14:47:23 +02:00
165 changed files with 105 additions and 129 deletions

View File

@ -67,7 +67,7 @@ cp $SCRIPTDIR/resources/alloc_fix.cpp ./3rdparty/ade/ade-0.1.1f/sources/ade/sour
echo "================================================================================"
echo "Compiling with make -j"
echo "================================================================================"
make -j
make -j3
### installing in output directory ###
echo "================================================================================"