songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
51,868 Commits 3 Branches 156 Tags 974 MiB
Commit Graph

51868 Commits

Author SHA1 Message Date
Guillaume Damiand 37d7b8ef0f Merge branch 'Combinatorial_map-reverse_orientation-kenohori-old' into Combinatorial_map-reverse_orientation-kenohori 2013-06-23 21:02:11 +02:00
Guillaume Damiand bef0f03f19 Merge branch 'Combinatorial_map_dynamic_onsplit_onmerge_functors-gdamiand' 
Approved by the release manager
 2013-06-23 20:40:28 +02:00
Guillaume Damiand 0f883bb5a7 Add small feature description in changes.html 2013-06-23 20:39:11 +02:00
Nico Kruithof 5ac2c05249 Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal 2013-06-21 21:47:48 +02:00
Sébastien Loriot 93b77ce529 only build the documentation if the BUILD_DOC is set to ON 
it is better located here
 2013-06-21 15:11:25 +02:00
Sébastien Loriot e85c0a241f Revert "only build the documentation if the BUILD_DOC is set to ON" 
This reverts commit 9ebb37fe28.
 2013-06-21 15:11:02 +02:00
Sébastien Loriot 496d75c256 update licenses that were incorrect after merging replace object feature branch 2013-06-21 15:06:17 +02:00
Sébastien Loriot 9ebb37fe28 only build the documentation if the BUILD_DOC is set to ON 2013-06-21 10:19:14 +02:00
Sébastien Loriot bbac0f31c2 Merge branch 'Polyhedron_gocad_write-GF' 
this affects only the polyhedron demo gocad plugin
 2013-06-20 08:32:58 +02:00
Sébastien Loriot f1e546a38b set name and color 2013-06-20 08:31:28 +02:00
Sébastien Loriot 2463131774 the output polyhedron type is now a template parameter 2013-06-20 08:00:19 +02:00
Sébastien Loriot 969cbc537b add missing call to vertex visitor for edge_split 2013-06-20 07:57:04 +02:00
Sébastien Loriot 26a46e2fa9 use Default for template parameters 2013-06-20 07:57:04 +02:00
Andreas Fabri 914f60234c fix typo 2013-06-19 14:12:08 +02:00
Laurent Rineau b7d9c76cb4 Merge branch 'Intersections_2-fix_object_variant_warnings-lrineau' 
Tested in CGAL-4.3-Ic-65.

Approved by the Release Manager
 2013-06-19 11:20:55 +02:00
Sébastien Loriot 0f995306ee prevent an include file to be parsed by doxygen 2013-06-19 09:57:41 +02:00
Sébastien Loriot c3b717e4a5 correct introduction release 2013-06-19 07:56:30 +02:00
Laurent Rineau e80d83500b Fix new warnings in the Object-boost::variant code 2013-06-18 10:54:38 +02:00
Guillaume Damiand 1018501173 Replace t.get<i>() by CGAL::cpp11::get<i>(t) for tuples. 2013-06-18 09:33:37 +02:00
Guillaume Damiand eebf72eb3d Doc for dynamic onsplit/onmerge functors. 2013-06-17 12:37:33 +02:00
Sébastien Loriot ebe2f62777 doxygen: fix mathjax option in cmake 2013-06-17 11:57:20 +02:00
Guillaume Damiand 867cf4767e Example for dynamic functor. 2013-06-17 10:14:04 +02:00
Sébastien Loriot 829a6c0ac1 doxygen: prevent linking 2013-06-17 09:52:08 +02:00
Sébastien Loriot e3bdde7054 remove explicit reference to a header file 2013-06-17 09:52:08 +02:00
Guillaume Damiand 444ba939a8 Dynamic attributes for onmerge and onsplit. 
Copy of master, and integrations of modifs done in the branch Combinatorial_map_dynamic_onxxxfunctors-gdamiand. Add an example in  map_3_dynamic_onmerge.cpp.
 2013-06-16 20:48:01 +02:00
Efi Fogel e9748e047a Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal 2013-06-16 11:46:27 +03:00
Efi Fogel 7aedf66f1a pacify MSVC: fixed a friend statement in a nexted class 2013-06-16 11:45:41 +03:00
Sébastien Loriot 43b92fac82 update changes 2013-06-14 14:58:15 +02:00
Sébastien Loriot c09ec2beaa Merge branch 'Kernel-replace_object-pmoeller' 
Successfully tested in CGAL-4.3-Ic-59
Approved by the release manager

Conflicts:
	Kernel_23/doc/Kernel_23/CGAL/intersections.h
	Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
	Kernel_d/doc/Kernel_d/Kernel_d.txt
	STL_Extension/doc/STL_Extension/CGAL/iterator.h
 2013-06-14 14:26:05 +02:00
Guillaume Damiand 98a4e30f34 Merge branch 'Combinatorial_map_copy2-gdamiand' 
Approved by the release manager
 2013-06-14 13:33:46 +02:00
Laurent Rineau 149b43c28f Merge branch 'Scripts-fix_cgal_test-lrineau' 
It fixes a bug during the detection of availlable targets in a Makefile,
when one file or directory in the sources directory is named "help".

Approved by the Release Manager.
 2013-06-14 11:47:58 +02:00
Sébastien Loriot 97048f10d1 Exact_type_selector has been renamed Exact_field_selector 2013-06-13 20:41:16 +02:00
Sébastien Loriot 716f87d2d7 rename Hidden_type to unspecified_type and update its description 2013-06-13 18:48:58 +02:00
Sébastien Loriot a7b80aa998 Merge branch 'First_of_pair_property_map-new_version-iyaz' 
related to this small-feature:
  Features/Small_Features/Property_maps_change_of_key_type

Successfully tested in CGAL-4.3-Ic-59 and approved by the release manager

Conflicts:
	Installation/changes.html
 2013-06-13 18:09:23 +02:00
Sébastien Loriot b172b06b39 update changes.html 2013-06-13 18:02:11 +02:00
Guillaume Damiand 2198f959a7 Add modif in changes.html 2013-06-13 17:59:05 +02:00
Guillaume Damiand d1395ba609 Add doc for new constructor, operator= and swap method. 2013-06-13 17:58:31 +02:00
Sébastien Loriot ffa4bf7d34 rename MACRO to enable old code 2013-06-13 17:04:50 +02:00
Sébastien Loriot 2e7f87f7e6 remove comments 2013-06-13 16:41:20 +02:00
Sébastien Loriot 275c21022e doc: use bullet list 2013-06-13 16:11:41 +02:00
Sébastien Loriot b6a332acb6 remove remaining Typed_identity_property_map_by_reference 2013-06-13 16:00:23 +02:00
Sébastien Loriot 4124fe8d97 use lower case for a variable 2013-06-13 15:28:30 +02:00
Sébastien Loriot 9382e74a4d use relative path in tagfiles, otherwise documentation output cannot be moved 
I re-apply the only correct part I wanted to do in ea256c9
 2013-06-13 15:21:35 +02:00
Sébastien Loriot 0f8498f3b5 Revert "use relative path in tagfiles, otherwise documentation output cannot be moved" 
This reverts commit ea256c954a.

Conflicts:
	Documentation/CMakeLists.txt
 2013-06-13 15:21:07 +02:00
Guillaume Damiand 50fd54b5f1 Patch for compiler gcc4.3 
(Sebastien is the best, even it is not fair because I don't have access to the compiler. But I will pay my beer ;)
 2013-06-13 14:53:04 +02:00
Sébastien Loriot ceab41bda6 do not reset item list when replacing an item 2013-06-13 14:40:54 +02:00
Sébastien Loriot d1374bf6dc update the bbox when replacing an item that is of different size 2013-06-13 14:40:45 +02:00
Laurent Rineau e740108114 Fix cgal_test detection of existing targets 2013-06-13 13:53:36 +02:00
Sébastien Loriot ee04fb3293 doxygen: add cmake option CGAL_DOC_RELEASE to set option for releasing doc 
for now we just disable TODO-list
 2013-06-13 13:10:06 +02:00
Sébastien Loriot 2dc828791e doxygen: set SHOW_FILE to NO for all packages 2013-06-13 13:10:06 +02:00