Daniele Panozzo
7fbfe317f9
Merge commit '26bfb6db5bd230eae0d71610c8bb5a1c627b2380'
# Conflicts:
# README.md
# include/igl/adjacency_matrix.cpp
# include/igl/ambient_occlusion.cpp
# include/igl/angle_bound_frame_fields.cpp
# include/igl/colon.cpp
# include/igl/comb_cross_field.cpp
# include/igl/comb_line_field.cpp
# include/igl/copyleft/boolean/mesh_boolean.cpp
# include/igl/copyleft/boolean/mesh_boolean.h
# include/igl/copyleft/cgal/RemeshSelfIntersectionsParam.h
# include/igl/copyleft/cgal/SelfIntersectMesh.h
# include/igl/copyleft/cgal/closest_facet.cpp
# include/igl/copyleft/cgal/closest_facet.h
# include/igl/copyleft/cgal/extract_cells.cpp
# include/igl/copyleft/cgal/order_facets_around_edge.cpp
# include/igl/copyleft/cgal/order_facets_around_edge.h
# include/igl/copyleft/cgal/outer_hull.cpp
# include/igl/copyleft/cgal/outer_hull.h
# include/igl/copyleft/cgal/piecewise_constant_winding_number.cpp
# include/igl/copyleft/cgal/propagate_winding_numbers.cpp
# include/igl/copyleft/cgal/propagate_winding_numbers.h
# include/igl/copyleft/cgal/remesh_intersections.cpp
# include/igl/copyleft/cgal/remesh_intersections.h
# include/igl/copyleft/marching_cubes.cpp
# include/igl/copyleft/marching_cubes.h
# include/igl/copyleft/quadprog.cpp
# include/igl/copyleft/tetgen/cdt.cpp
# include/igl/cross_field_missmatch.cpp
# include/igl/cut_mesh.cpp
# include/igl/cut_mesh_from_singularities.cpp
# include/igl/embree/unproject_onto_mesh.cpp
# include/igl/extract_manifold_patches.h
# include/igl/find_cross_field_singularities.cpp
# include/igl/line_field_missmatch.cpp
# include/igl/list_to_matrix.cpp
# include/igl/n_polyvector.cpp
# include/igl/n_polyvector_general.cpp
# include/igl/piecewise_constant_winding_number.cpp
# include/igl/polyvector_field_matchings.cpp
# include/igl/project_to_line.cpp
# include/igl/ray_mesh_intersect.cpp
# include/igl/ray_mesh_intersect.h
# include/igl/sort.cpp
# include/igl/unproject_in_mesh.cpp
# include/igl/unproject_in_mesh.h
# tutorial/609_Boolean/CMakeLists.txt
# tutorial/610_CSGTree/CMakeLists.txt
# tutorial/CMakeLists.shared
# tutorial/CMakeLists.txt
2016-03-02 17:46:15 -05:00
..
2015-10-21 23:31:40 +02:00
2016-03-02 17:46:15 -05:00