Commit Graph

64306 Commits

Author SHA1 Message Date
Jane Tournois a2fee7d68e Merge branch 'Polygon_mesh_processing-GF' of github.com:CGAL/cgal-public-dev into Polygon_mesh_processing-GF 2015-07-01 18:21:54 +02:00
Jane Tournois 6dadd19bf6 add entry to changes.html 2015-07-01 18:21:16 +02:00
Laurent Rineau 1687824eb5 Remove a space that confuses the script
./Scripts/developer_scripts/detect_packages_licenses does not agree with
the spurious space at the end.
2015-07-01 18:14:13 +02:00
Laurent Rineau bb27094bea Remove a space that confuses the script
./Scripts/developer_scripts/detect_packages_licenses does not agree with
the spurious space at the end.
2015-07-01 18:04:59 +02:00
Andreas Fabri 9087f863a4 fix previous commit 2015-07-01 17:40:57 +02:00
Andreas Fabri 4c841d73e8 fix previous commit 2015-07-01 17:38:37 +02:00
Andreas Fabri 8d86bebcaf Merge remote-tracking branch 'cgal-dev/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 2015-07-01 17:25:13 +02:00
Andreas Fabri bec3370540 avoid merge conflicts by moving lines 2015-07-01 17:03:13 +02:00
Andreas Fabri 25a3009da7 fix macros protecting files 2015-07-01 16:39:28 +02:00
Andreas Fabri 7843ad8b3f fix poisson test 2015-07-01 16:16:37 +02:00
Maxime Gimeno 2f121f103c warnings fix 2015-07-01 16:10:31 +02:00
Andreas Fabri e072756d15 workaround to make the MCF Skeleton package compile with and without PMP 2015-07-01 15:54:29 +02:00
Andreas Fabri 252e35a6a5 workaround to make the package compile with and without PMP 2015-07-01 15:52:36 +02:00
Guillaume Damiand 662408b2f8 Improve merge coplanar faces method. 2015-07-01 15:21:35 +02:00
Monique Teillaud 869db5e397 Update Regular_triangulation_euclidean_traits_3.h
added missing type Point_3
2015-07-01 14:55:17 +02:00
Jane Tournois cd3493d139 fix compilation 2015-07-01 14:40:22 +02:00
Andreas Fabri 28c631a177 fix BGL test suite 2015-07-01 14:25:20 +02:00
Laurent Rineau bb1b3deb96 Fix -Wreorder for Scene_item.h 2015-07-01 14:04:07 +02:00
Andreas Fabri 20c1b1a1f6 Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF
Conflicts:
	BGL/include/CGAL/boost/graph/Euler_operations.h
	BGL/include/CGAL/boost/graph/iterator.h
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_inside_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Selection_widget.ui
2015-07-01 13:52:44 +02:00
Jane Tournois 2c6b6a9ee9 reintroduce template keyword
msvc seems to be ok with it
2015-07-01 13:04:36 +02:00
Jane Tournois 631a60ea85 fix compilation errors for visual studio
note that removing the "template" keyword may break compilation
for other compilers
2015-07-01 12:48:05 +02:00
Jane Tournois ed9f4b8233 rename dual.cpp 2015-07-01 10:24:44 +02:00
Jane Tournois abec5f1c88 rename dual example 2015-07-01 10:18:21 +02:00
Jane Tournois 49b2c90f3b rename normals test 2015-07-01 10:12:05 +02:00
Guillaume Damiand 7f0b73634a Remove typename outside templace class 2015-07-01 07:28:37 +02:00
Andreas Fabri cb0444be6d fix copyrght headers 2015-06-30 20:02:04 +02:00
Andreas Fabri 9356e59af0 fix copyrght headers 2015-06-30 19:54:25 +02:00
Laurent Rineau c1a0afd97a updated crontab (automated commit) 2015-06-30 19:13:36 +02:00
Panagiotis Cheilaris b1cec26e33 do not include sdglinf scripts in releases 2015-06-30 19:00:07 +02:00
Clement Jamin 41e7ee2093 Add our plugin to the list 2015-06-30 16:58:21 +02:00
Guillaume Damiand fbfd47896b Remove the use of glu tesselator to draw non convex faces. 2015-06-30 14:22:53 +02:00
Maxime Gimeno 0a55b1399e Mesh_3 fix post merge 2015-06-30 13:47:52 +02:00
Maxime Gimeno 8ab112f5bd Merge and new plugin fixes 2015-06-30 13:03:20 +02:00
Clement Jamin 3fac8e761a Merge branch 'Point_set_shape_detection_3-cjamin-old' into Point_set_shape_detection_3-cjamin 2015-06-30 10:36:11 +02:00
Jane Tournois 2060a4e1ad remove \todo : done 2015-06-30 10:35:40 +02:00
Jane Tournois 56b6a59c4c Merge branch 'Polygon_mesh_processing-GF' of github.com:CGAL/cgal-public-dev into Polygon_mesh_processing-GF 2015-06-30 10:32:12 +02:00
Panagiotis Cheilaris 0c135374cb clean up copyright messages 2015-06-30 10:32:11 +02:00
Panagiotis Cheilaris e1be73c05b do not use std::forward_as_tuple before MSVS2012 2015-06-30 10:32:11 +02:00
Panagiotis Cheilaris 9e15338ffc fix otherpnt sdglinf warning 2015-06-30 10:32:11 +02:00
Panagiotis Cheilaris dbde1af6c0 correct sdglinf examples in documentation 2015-06-30 10:32:11 +02:00
Panagiotis Cheilaris edba785d21 sdglinf remove missing test inputs from test files 2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris 5b413d92a4 fix warning in Vertex_conflict_C2 with otherpnt 2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris 142414c123 sdglinf CGAL_USE for Release warning fixes 2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris 3e89ca702d sdglinf demo avoid Site_2 warning 2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris 0db2dd8573 sdglinf ring avoid conversion of Sign to bool 2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris 30b1e34894 avoid conversion of Sign to bool in sdglinf 2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris 47383a4944 sdglinf avoid min max macro expansion 2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris 3d8cc0637f sdglinf CMakeLists fixes from sdgl2 2015-06-30 10:32:10 +02:00
Panagiotis Cheilaris 9d24a3e5c4 sdglinf demo Q_EMIT use etc. 2015-06-30 10:32:09 +02:00
Panagiotis Cheilaris 4eabd4c09c remove sdglinf painter, widget warnings 2015-06-30 10:32:09 +02:00