phynexis-deps/igl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
4265f2851eb4e2b7f2e06478338db63e5ecb4e5a
igl/lib
T
History
Daniele Panozzo 4265f2851e Merge commit '471f0c9c37478120dd910bef84bbe87fd96fcaa7 [formerly a49c23f0c8]' 
Conflicts:
	include/igl/embree/EmbreeIntersector.h
	include/igl/viewer/TextRenderer.cpp
	include/igl/viewer/TextRenderer.h
	include/igl/viewer/Viewer.cpp

Former-commit-id: 8ebae80179
2015-06-25 00:49:13 +02:00
..
cmake_install.cmake
Merge commit '471f0c9c37478120dd910bef84bbe87fd96fcaa7 [formerly a49c23f0c8]'
2015-06-25 00:49:13 +02:00
CMakeCache.txt
Merge commit '471f0c9c37478120dd910bef84bbe87fd96fcaa7 [formerly a49c23f0c8]'
2015-06-25 00:49:13 +02:00
Makefile.REMOVED.git-id
Merge commit '471f0c9c37478120dd910bef84bbe87fd96fcaa7 [formerly a49c23f0c8]'
2015-06-25 00:49:13 +02:00