• Pierre Kraemer's avatar
    Merge branch 'master' of cgogn:CGoGN · 86e9a825
    Pierre Kraemer authored
    Conflicts:
    	SCHNApps/Plugins/surfaceDeformation/include/surfaceDeformation.h
    	SCHNApps/Plugins/surfaceDeformation/src/surfaceDeformation.cpp
    	ThirdParty/include/OpenNL/linear_solver.h
    	ThirdParty/include/OpenNL/linear_solver.hpp
    86e9a825
surfaceDeformation.h 3.56 KB