cgal/Point_set_processing_3/doc
Sébastien Loriot e5b72ac5b3 Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron
Conflicts:
	Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
	BGL/examples/BGL_arrangement_2/primal.cpp
	BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.hpp
	Installation/changes.html
	Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
2014-11-05 16:11:35 +01:00
..
Point_set_processing_3 Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron 2014-11-05 16:11:35 +01:00
Property_map Merge branch 'First_of_pair_property_map-new_version-iyaz' 2013-06-13 18:09:23 +02:00