Merge remote-tracking branch 'cgal/releases/CGAL-4.6-branch'

Browse Source

A non-modifying merge, to register that `master` is ahead of
`CGAL-4.6-branch`.

Conflicts:
	Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h
	Maintenance/release_building/BUGFIX_NUMBER
	Maintenance/release_building/public_release_name

...

This commit is contained in:

Laurent Rineau 2015-08-28 16:25:33 +02:00

parent aed4e8b2fc 8a0731835e

commit db6b844cc8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available