diff --git a/Installation/CHANGES b/Installation/CHANGES
index 77b7df95a2c..bf3a0c79f5b 100644
--- a/Installation/CHANGES
+++ b/Installation/CHANGES
@@ -2,72 +2,104 @@ Release notes of CGAL.
----------------------------- Release 3.6 ----------------------------------
-*******
-NOTE: The section "Release 3.6" of the current file Will be re-formatted
-by the release manager a few days before the release. For the moment, you
-can simply add your changes with the formating you want.
-*******
-
CGAL 3.6 offers the following improvements and new functionality :
-* 2D/3D Regular triangulations : Weighted_point now has a constructor
- from Cartesian coordinates.
+
Geometry Kernels
-* 2D and 3D Geometry Kernel:
+2D and 3D Geometry Kernel
- Add new do_intersect() and intersection() overloads:
+ do_intersect(Bbox_3, Bbox_3/Line_3/Ray_3/Segment_3)
+ intersection(Triangle_3, Line_3/Ray_3/Segment_3)
-* 3D Triangulations :
+
+Polygons
+
+2D Regularized Boolean Set-Operations
+
+ - Fixed General_polygon_set_2::arrangement() to return the proper type
+ of object.
+
+
+Arrangement
+
+2D Arrangements
+
+ - Fixed passing a (const) traits object to the constructor of Arrangement_2.
+
+ - Introduced Arrangement_2::fictitious_face(), which returns the fictitious
+ face in case of an unbounded arrangement.
+
+ - Fixed a bug in Bezier-curve handling.
+
+ - Added (back) iterator, number_of_holes(), holes_begin(), and holes_end()
+ to the default DCEL for backward compatibility.
+
+ - Added (simple) versions of the free overlay() function. It employs the
+ default overlay-traits, which practically does nothing.
+
+
+
+Triangulations and Delaunay Triangulations
+
+2D/3D Regular triangulations
+
+ - Weighted_point now has a constructor from Cartesian coordinates.
+
+3D Triangulations
+
- Regular_triangulation_3 : semi-static floating-point filters are now used
in its predicates, which can speed up its construction by a factor of about 3
when Exact_predicates_inexact_constructions_kernel is used.
+
- The class Regular_triangulation_filtered_traits_3 is deprecated, the class
Regular_triangulation_euclidean_traits_3 must be used instead. The
predicates of that traits will be filtered if the kernel given as template
parameter of that traits is itself a filtered kernel.
+
- Triangulation_hierarchy_3 is now deprecated, and replaced by a simpler
CGAL::Fast_location policy template parameter of Delaunay_triangulation_3.
+
- The old version of remove() (enabled with CGAL_DELAUNAY_3_OLD_REMOVE)
has been deleted.
-* 3D Periodic triangulations:
+3D Periodic triangulations
+
- New demo: 3D periodic Lloyd algorithm.
+
- New functionality for Voronoi diagrams: dual of an edge and of a vertex,
volume and centroid of the dual of a vertex.
+
- The package can now be used with the 3D Alpha Shapes package to compute
periodic alpha shapes.
-* 3D Alpha shapes:
+3D Alpha shapes
+
- The class Weighted_alpha_shape_euclidean_traits_3 is deprecated, the class
Regular_triangulation_euclidean_traits_3 must be used instead.
+
- The package can now be used together with the 3D Periodic Triangulation
package to compute periodic alpha shapes.
-* 3D Mesh Generation
- - The mesh generator has been enriched which an optimisation phase to provide 3D meshes
- with well shaped tetrahedra (and in particular no slivers). The optimization phase
- involves four different optimization processes: two global opitimization processes (ODT anf Lloyd),
- a pertuber and an exuder. Each of these processes can be activated or not, and tuned to the users
- needs and to available computer resources.
-* Arrangement_on_surface_2:
- - Fixed passing a (const) traits object to the constructor of Arrangement_2.
- - Introduced Arrangement_2::fictitious_face(), which returns the fictitious
- face in case of an unbounded arrangement.
- - Fixed a bug in Bezier-curve handling.
- - Added (back) iterator, number_of_holes(), holes_begin(), and holes_end()
- to the default DCEL for backward compatibility.
- - Added (simple) versions of the free overlay() function. It employs the
- default overlay-traits, which practically does nothing.
+Mesh Generation
-* Boolean_set_operations_2:
- - Fixed General_polygon_set_2::arranngement() to return the proper type
- of object.
+3D Mesh Generation
+
+ - The mesh generator has been enriched which an optimization phase to
+ provide 3D meshes with well shaped tetrahedra (and in particular no
+ slivers). The optimization phase involves four different optimization
+ processes: two global optimization processes (ODT anf Lloyd), a
+ pertuber and an exuder. Each of these processes can be activated or
+ not, and tuned to the users needs and to available computer resources.
+
+Support library
+
+CGAL ipelets
-* CGAL_ipelets:
- Add support for version 7 of Ipe.
+
+
----------------------------- Release 3.5 ----------------------------------
CGAL releases will now be published about every six months. As a transition
release, CGAL-3.5 has been developed during 9 months from the release
diff --git a/Installation/cmake/modules/FindQGLViewer.cmake b/Installation/cmake/modules/FindQGLViewer.cmake
index 9904eed4eb2..9fc8955902b 100644
--- a/Installation/cmake/modules/FindQGLViewer.cmake
+++ b/Installation/cmake/modules/FindQGLViewer.cmake
@@ -15,7 +15,7 @@ find_path(QGLVIEWER_INCLUDE_DIR
)
find_library(QGLVIEWER_LIBRARY_RELEASE
- NAMES qglviewer QGLViewer QGLViewer2
+ NAMES qglviewer-qt4 qglviewer QGLViewer QGLViewer2
PATHS /usr/lib
/usr/local/lib
ENV QGLVIEWERROOT
diff --git a/Installation/doc_tex/Installation/installation.tex b/Installation/doc_tex/Installation/installation.tex
index 2f45c0e44b9..ac14b773ce5 100644
--- a/Installation/doc_tex/Installation/installation.tex
+++ b/Installation/doc_tex/Installation/installation.tex
@@ -114,7 +114,7 @@ In order to build the \cgal\ libraries, you need a \CC\ compiler.
\gdef\lcTabularBorder{2}
\begin{tabular}{|l|l|} \hline
\textbf{compiler} & \textbf{operating system}\\\hline\hline
- \Gcc{4.0, 4.1, 4.2, 4.3} \footnotemark[10]
+ \Gcc{3.4, 4.0, 4.1, 4.2, 4.3} \footnotemark[10]
& Solaris 2.6+ / Linux 2.x / MacOS X
\\ & \mswin\ 95/98/2000/XP/NT4\footnotemark[11]\\\hline
\msvc{8.0, 9.0} (\textsc{Visual Studio 2005 and 2008}) \footnotemark[12]
diff --git a/Surface_mesher/test/Surface_mesher/implicit_surface_mesher_test.cpp b/Surface_mesher/test/Surface_mesher/implicit_surface_mesher_test.cpp
index 6e69b26a82f..4e0148caeee 100644
--- a/Surface_mesher/test/Surface_mesher/implicit_surface_mesher_test.cpp
+++ b/Surface_mesher/test/Surface_mesher/implicit_surface_mesher_test.cpp
@@ -178,8 +178,8 @@ void test_with_tag(Tag = CGAL::Non_manifold_tag())
Tag>()();
#ifndef CGAL_SURFACE_MESHER_SINGLE_TEST
- std::cout << "\nKERNEL CGAL::Filtered_kernel >...\n";
- Test_with_kernel >,Tag>()();
+ std::cout << "\nKERNEL CGAL::Filtered_kernel >...\n";
+ Test_with_kernel >,Tag>()();
Test_with_kernel >,
Tag >()(DO_NOT_RUN);
diff --git a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake
index 20400fff6f4..75a8e8d5c53 100755
--- a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake
+++ b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake
@@ -164,19 +164,11 @@ if [ $# -ne 0 ] ; then
done
else
echo "Run all tests."
- if [ `can_compile APSS_reconstruction` == "y" ]; then
- compile_and_run APSS_reconstruction
- [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
- fi
- if [ `can_compile APSS_reconstruction_example` == "y" ]; then
- compile_and_run APSS_reconstruction_example
- [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
- fi
- if [ `can_compile poisson_reconstruction` == "y" ]; then
+ if [ `can_compile poisson_reconstruction` = "y" ]; then
compile_and_run poisson_reconstruction
[ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
fi
- if [ `can_compile poisson_reconstruction_example` == "y" ]; then
+ if [ `can_compile poisson_reconstruction_example` = "y" ]; then
compile_and_run poisson_reconstruction_example
[ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
fi
@@ -186,7 +178,7 @@ fi
# The clean target generated by CMake under cygwin
# always fails for some reason
#
-if [ "${NEED_CLEAN}" == "y" ]; then
+if [ "${NEED_CLEAN}" = "y" ]; then
if ! ( uname | grep -q "CYGWIN" ) ; then
${MAKE_CLEAN_CMD}
fi