Merge branch '5.5.x-branch'

# Conflicts:
#	Installation/include/CGAL/version.h
#	Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
This commit is contained in:
Laurent Rineau 2022-06-15 10:23:16 +02:00
commit 03508a96f4
1 changed files with 1 additions and 0 deletions

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
/*/*/*/build
/*/*/*/VC*
/*/*/*/GCC
.vscode
AABB_tree/demo/AABB_tree/AABB_demo
AABB_tree/demo/AABB_tree/Makefile
AABB_tree/examples/AABB_tree/*.kdev*