Daniele Panozzo 8d2967ebdc Merge branch 'viewer-refactor' of https://github.com/libigl/libigl into viewer_refactor ...

# Conflicts:
#	include/igl/opengl/State.cpp
#	include/igl/opengl/glfw/Viewer.cpp
#	shared/cmake/libigl.cmake
#	tutorial/609_Boolean/CMakeLists.txt
#	tutorial/704_SignedDistance/main.cpp

2018-02-03 20:15:02 -05:00

..

CMakeLists.txt

merge

2017-10-13 10:22:58 -04:00

main.cpp

Merge branch 'viewer-refactor' of https://github.com/libigl/libigl into viewer_refactor

2018-02-03 20:15:02 -05:00