mirror of https://github.com/CGAL/cgal
3deb8e7910
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.
There was a conflict with two features recently merged into 'master' for
CGAL-4.5:
- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
the small feature:
http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper
- parallelism for Triangulation_3 and Mesh_3:
http://cgal.org/wiki/Features/Parallel_Mesh_3
Conflicts:
Combinatorial_map/include/CGAL/Cell_attribute.h
Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
Polyhedron/demo/Polyhedron/Polyhedron_type.h
STL_Extension/include/CGAL/Compact_container.h
STL_Extension/test/STL_Extension/test_Compact_container.cpp
I also modified the following files during the conflict resolution:
Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
|
||
|---|---|---|
| .. | ||
| data | ||
| old_stuff | ||
| CMakeLists.txt | ||
| debug.h | ||
| implicit_functions.cpp | ||
| implicit_functions.h | ||
| mesh_3D_image.cpp | ||
| mesh_3D_image_variable_size.cpp | ||
| mesh_cubes_intersection.cpp | ||
| mesh_cubes_intersection_with_features.cpp | ||
| mesh_implicit_domains.cpp | ||
| mesh_implicit_domains_2.cpp | ||
| mesh_implicit_ellipsoid.cpp | ||
| mesh_implicit_sphere.cpp | ||
| mesh_implicit_sphere_variable_size.cpp | ||
| mesh_optimization_example.cpp | ||
| mesh_optimization_lloyd_example.cpp | ||
| mesh_polyhedral_domain.cpp | ||
| mesh_polyhedral_domain_with_features.cpp | ||
| mesh_polyhedral_edge_tolerance_region.cpp | ||
| mesh_polyhedral_implicit_function.cpp | ||
| mesh_polyhedral_surface_tolerance_region.cpp | ||
| mesh_two_implicit_spheres_with_balls.cpp | ||