Olga Diamanti ed64cad992 Merge branch 'master' of https://github.com/libigl/libigl ...

Conflicts:
	build/Makefile_embree
	build/Makefile_png
	include/igl/cut_mesh_from_singularities.cpp

Former-commit-id: d4c7a9e298

2015-06-20 18:49:01 +02:00

..

Makefile_embree

rm old build dir, use cmake

2015-06-12 16:02:15 -04:00

Makefile_png

rm old build dir, use cmake

2015-06-12 16:02:15 -04:00