Daniele Panozzo
bd29dddc76
Merge commit 'cdcf34637fa2d9c3039f28c455e26fe5edbfa1a4 [formerly 2341af78ca]'
...
Conflicts:
tutorial/607_LIM/main.cpp
- viewer timer is now cross platform
- glew is now properyl included in all the viewer files
Former-commit-id: 8505d91055
2014-06-30 16:40:27 +02:00
schuellc
cdcf34637f
Fixed some windows specific issues
...
Former-commit-id: 2341af78ca
2014-06-30 16:28:13 +02:00
Daniele Panozzo
64038eebef
Merge commit '96d0f0f75c68e5ace90eaa9c3f6f7af63f053578 [formerly 2bae5b6002]'
...
Former-commit-id: 4122054c4e
2014-06-30 16:13:27 +02:00
schuellc
96d0f0f75c
Merge branch 'master' of https://github.com/libigl/libigl
...
Conflicts:
tutorial/607_LIM/main.cpp
Former-commit-id: 2bae5b6002
2014-06-30 15:30:56 +02:00
schuellc
c001e7f1b7
Added disabling option for lim tutorial
...
Former-commit-id: de9eaee839
2014-06-30 15:23:32 +02:00
Daniele Panozzo
ec1c86dfee
small fix in lim example
...
Former-commit-id: 6ad928610d
2014-06-30 14:41:12 +02:00
Daniele Panozzo
f14575cedf
Merge commit '9f6c5cdbda735487398f11b323082d46d30b1466 [formerly e63f9f14e9]'
...
Conflicts:
tutorial/CMakeLists.txt
removed redundant linsolve_with_fixed.h
Former-commit-id: ec8986f7b5
2014-06-30 13:00:59 +02:00
schuellc
9f6c5cdbda
Added lim tutorial
...
Former-commit-id: e63f9f14e9
2014-06-30 11:47:27 +02:00
Daniele Panozzo