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
|
||
|---|---|---|
| .. | ||
| internal/boost | ||
| CC_safe_handle.h | ||
| Cache.h | ||
| Circulator_identity.h | ||
| Circulator_on_node.h | ||
| Circulator_project.h | ||
| Compact_container.h | ||
| Complexity_tags.h | ||
| Concatenate_iterator.h | ||
| Concurrent_compact_container.h | ||
| Counting_iterator.h | ||
| Default.h | ||
| Flattening_iterator.h | ||
| Fourtuple.h | ||
| Handle.h | ||
| Handle_for.h | ||
| Handle_for_virtual.h | ||
| Handle_with_policy.h | ||
| Has_timestamp.h | ||
| In_place_list.h | ||
| Inverse_index.h | ||
| Iterator_project.h | ||
| Iterator_transform.h | ||
| Join_input_iterator.h | ||
| Location_policy.h | ||
| Modifiable_priority_queue.h | ||
| Multiset.h | ||
| N_step_adaptor.h | ||
| N_step_adaptor_derived.h | ||
| Nested_iterator.h | ||
| Object.h | ||
| Random_access_adaptor.h | ||
| Random_access_value_adaptor.h | ||
| Sixtuple.h | ||
| Spatial_lock_grid_3.h | ||
| Threetuple.h | ||
| Time_stamper.h | ||
| Twotuple.h | ||
| Uncertain.h | ||
| algorithm.h | ||
| array.h | ||
| assertions.h | ||
| assertions_behaviour.h | ||
| copy_n.h | ||
| exceptions.h | ||
| function_objects.h | ||
| is_convertible.h | ||
| is_iterator.h | ||
| is_streamable.h | ||
| iterator.h | ||
| memory.h | ||
| min_max_n.h | ||
| multiset_assertions.h | ||
| result_of.h | ||
| tags.h | ||
| tuple.h | ||
| type_traits.h | ||
| utility.h | ||
| vector.h | ||