Marc Glisse 3168c851a1 Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse ... Conflicts: Kernel_d/doc_tex/Kernel_d/kernel_representation_d.tex Kernel_d/doc_tex/Kernel_d_ref/Homogeneous_d.tex Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex Kernel_d/doc_tex/Kernel_d_ref/main.tex Resolved by dropping those files.		2014-03-12 12:38:08 +01:00
..
benchmark/copy_n_benchmark	CMake: Fix the handling of cmake_policy	2012-08-22 12:35:03 +00:00
doc/STL_Extension	remove make_sorted_pair from the documentation	2014-02-18 11:30:24 +01:00
examples/STL_Extension	Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller	2013-03-14 10:29:31 +01:00
include/CGAL	Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse	2014-03-12 12:38:08 +01:00
package_info/STL_Extension	New license.txt files (eol changes)	2013-02-19 16:46:39 +01:00
src/CGAL	…
test/STL_Extension	Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse	2014-03-12 12:38:08 +01:00
dont_submit	Put doc/ in the global dont_submit file	2013-08-20 10:57:03 +02:00