SCHNApps/Plugins/surfaceDeformation/include/surfaceDeformation.h · 86e9a825b79ac9ed5e5facd9c6dc8b4c3cafc9d5 · CGoGN / CGoGN

Merge branch 'master' of cgogn:CGoGN · 86e9a825

Pierre Kraemer authored Feb 06, 2013

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

Replace surfaceDeformation.h