Merge branch 'Spatial_searching-Rectangle_compiletimeD-gf' into Spatial_searching-final_acceleration-gf

Browse Source

Conflicts:
	Spatial_searching/benchmark/Spatial_searching/nn3cgal.cpp
	Spatial_searching/include/CGAL/Kd_tree.h
	Spatial_searching/include/CGAL/Kd_tree_node.h

...

This commit is contained in:

m.overtheil

2014-11-28 13:10:08 +01:00

parent 5b67887a5e d598526bfe

commit 9da9cff768

145 changed files with 381 additions and 38 deletions

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

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

Scripts/developer_scripts/cgal_generate_cmake_script

Executable → Regular