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

50320 Commits

Author SHA1 Message Date
Laurent Rineau 5bc36fb130 Another fix to the .gitattributes file 2012-11-27 11:39:21 +01:00
Guillaume Damiand 9143c7cc08 Merge branch 'Combinatorial_map_improve_iterators-gdamiand' 
Approved by the release manager.
 2012-11-27 11:16:00 +01:00
Laurent Rineau e5ae17fa12 Merge remote-tracking branch 'origin/master' 2012-11-27 11:10:42 +01:00
Laurent Rineau f4ac59ac7f Simplify the .gitattributes file 
And add exceptions
 2012-11-27 11:10:03 +01:00
Sébastien Loriot 74ba6aa454 add dummy files to maintain log and tags directory in git repo 2012-11-27 10:45:06 +01:00
Laurent Rineau e0fee953d1 Merge branch 'hot-fixes-for-Git' 2012-11-27 10:39:27 +01:00
Laurent Rineau 0e22e14a9c Fix eol issues 2012-11-27 10:39:15 +01:00
Sébastien Loriot 91e76d9bb8 Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal 2012-11-27 10:19:34 +01:00
Sébastien Loriot 4ec9529581 Merge branch 'doxy-port-pmoeller' 
Conflicts:
	.gitattributes
	Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h
	Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h
	Surface_reconstruction_points_3/include/CGAL/k_nearest_neighbor.h
 2012-11-27 10:05:41 +01:00
Laurent Rineau 9ea0693fc3 Merge branch 'hot-fixes-for-Git' 2012-11-27 09:50:36 +01:00
Laurent Rineau c7a2712c98 Quick and dirty fix: remove the RCSdef* macros 
Once we have switched to Git, RCS keywords $Date$, $Id$ and $URL$ are no
longer substituted. That may be restore one day but, for the moment, that
is easier to remove the support for \RCSdef* in manual tools.
 2012-11-27 09:48:54 +01:00
Sébastien Loriot 37560d1ec6 put hte whole Documentation directory content in dont_submit 2012-11-27 08:43:19 +01:00
Sébastien Loriot 9576be3c3b add doc in dont_submit 2012-11-27 08:42:02 +01:00
Sébastien Loriot 9347a5d812 remove empty lines at end of dont_submit files 2012-11-27 08:35:33 +01:00
Sébastien Loriot 7aef612a78 backport f1b0161b9d into doxygen 2012-11-27 08:25:36 +01:00
Luis Peñaranda f1b0161b9d details on doc of RS, RS3, MPFI 2012-11-26 15:14:30 -02:00
Laurent Rineau e8c1877e2f Add -text for a CRLF cmake file 2012-11-26 17:34:21 +01:00
Laurent Rineau e3eebfafe9 Add a new faster filter 
This filter is not correct.
It sets the same modification date for all files.
 2012-11-26 17:29:49 +01:00
Laurent Rineau c1c1d3000d *.nsh files have CRLF eol 2012-11-26 17:29:48 +01:00
Laurent Rineau 6495cbb9fb Reimplement the smudge filter in perl, faster 2012-11-26 17:29:48 +01:00
Laurent Rineau e92395d1e6 Add a new faster filter 
This filter is not correct.
It sets the same modification date for all files.
 2012-11-26 17:24:32 +01:00
Laurent Rineau e815d3ef34 *.nsh files have CRLF eol 2012-11-26 17:08:48 +01:00
Laurent Rineau cd03d5eaf2 Reimplement the smudge filter in perl, faster 2012-11-26 16:56:52 +01:00
Laurent Rineau a615cb2d4c Merge remote-tracking branch 'origin/hot-fixes-for-Git' 
Conflicts:
	.gitattributes
 2012-11-26 15:57:26 +01:00
Laurent Rineau 14899ee75f Simplify the .gitattributes file and add the dater filter for TeX files 2012-11-26 15:44:47 +01:00
Laurent Rineau a95e15585a New ruby program to use as a smudge filter for Git. 
See:
  http://git-scm.com/book/ch7-2.html#Keyword-Expansion
 2012-11-26 15:11:13 +01:00
Andreas Fabri d6c705e661 R -> Q 2012-11-26 13:11:18 +01:00
Laurent Rineau 8358f58ab6 Add a shebang for that script 2012-11-26 12:10:35 +01:00
Sébastien Loriot ce8875a403 add missing picture 2012-11-26 09:51:31 +01:00
Sébastien Loriot 469f179d9e subsection should be section 2012-11-26 09:50:38 +01:00
Sébastien Loriot 920eb63882 backporting documentation changes of master@9fcc5b57 into doxy-port-pmoeller 
Conflicts:
	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
	Installation/doc_tex/Installation/usage.tex
	Kernel_23/doc/Kernel_23/CGAL/Projection_traits_xy_3.h
	Mesh_2/doc/Mesh_2/Concepts/ConformingDelaunayTriangulationTraits_2.h
	Spatial_searching/doc/Spatial_searching/CGAL/Incremental_neighbor_search.h
	Spatial_searching/doc/Spatial_searching/CGAL/K_neighbor_search.h
	Spatial_searching/doc/Spatial_searching/CGAL/Orthogonal_incremental_neighbor_search.h
 2012-11-23 22:54:31 +01:00
Sébastien Loriot efd13bab22 backport commit in tex file from master into doxygen 
In order to keep the history of Poisson_reconstruction_function.h
I simply modified the doc without taking into account code change.
This will be done when merging with master
 2012-11-23 22:42:03 +01:00
Sébastien Loriot b26412cd06 backport commit in tex file from master into doxygen 2012-11-23 19:11:59 +01:00
Sébastien Loriot 12f13a686c backport commit in tex file from master into doxygen 2012-11-23 19:08:44 +01:00
Sébastien Loriot 0d72388975 backport commit in tex file from master into doxygen 2012-11-23 19:03:21 +01:00
Sébastien Loriot f9397e72c9 backport commit in tex file from master into doxygen 2012-11-23 18:23:53 +01:00
Sébastien Loriot 9c79cb5c7f backport commit in tex file from master into doxygen 2012-11-23 18:16:59 +01:00
Sébastien Loriot 787481eba0 backport commit in tex file from master into doxygen 2012-11-23 18:14:21 +01:00
Sébastien Loriot 6cc7d66415 Revert "Replace tex-style quotes with quotes that you would expect, as there" 
This reverts commit e65a8028ea.

Conflicts:
	Approximate_min_ellipsoid_d/doc_tex/Bounding_volumes_ref/Approximate_min_ellipsoid_d.tex
	Approximate_min_ellipsoid_d/documentation/mel.tex
	Documentation/doxyassist.xml
	Installation/doc_tex/Installation/usage.tex
	Min_sphere_of_spheres_d/doc_tex/Bounding_volumes_ref/MinSphereOfSpheresTraits.tex
	Optimisation_doc/doc_tex/Bounding_volumes/user_part.tex
	Optimisation_doc/doc_tex/Inscribed_areas/user_part.tex
	Width_3/doc_tex/Polytope_distance_d_ref/Width_3.tex
 2012-11-23 18:08:13 +01:00
Sébastien Loriot 7cd0e93fa9 Revert "Merge the changes to ccPrecond and ccPostcond that have been in" 
This reverts commit b529971917.

Conflicts:
	Approximate_min_ellipsoid_d/doc_tex/Bounding_volumes_ref/Approximate_min_ellipsoid_d.tex
	Matrix_search/doc_tex/Polytope_distance_d_ref/spec_all_furthest_neighbors.tex
	Min_annulus_d/doc_tex/Bounding_volumes_ref/Min_annulus_d.tex
	Min_circle_2/doc_tex/Bounding_volumes_ref/Min_circle_2.tex
	Min_ellipse_2/doc_tex/Bounding_volumes_ref/Min_ellipse_2.tex
	Min_quadrilateral_2/doc_tex/Bounding_volumes_ref/spec_oops.tex
	Min_sphere_d/doc_tex/Bounding_volumes_ref/Min_sphere_d.tex
	Min_sphere_of_spheres_d/doc_tex/Bounding_volumes_ref/MinSphereOfSpheresTraits.tex
	Min_sphere_of_spheres_d/doc_tex/Bounding_volumes_ref/Min_sphere_of_spheres_d.tex
	Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Taucs_matrix.tex
	Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Taucs_symmetric_matrix.tex
	Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_2.tex
	Width_3/doc_tex/Polytope_distance_d_ref/Width_3.tex
 2012-11-23 18:04:33 +01:00
Sébastien Loriot 61fa49b242 Revert "break apart multi-cites, TO BE UNMERGED" 
This reverts commit 5688d58b1b.

Conflicts:
	Matrix_search/doc_tex/Bounding_volumes_ref/spec_rectangular_p_centers.tex
 2012-11-23 18:01:10 +01:00
Laurent Rineau 7d6c85c61b Commit files generated by ./makebiblio 2012-11-23 17:55:47 +01:00
Sébastien Loriot 2c3d505bb6 backport commit in tex file from master into doxygen 2012-11-23 17:55:07 +01:00
Sébastien Loriot 991561878f backport commit in tex file from master into doxygen 2012-11-23 17:54:48 +01:00
Sébastien Loriot efc7379592 backport commit in tex file from master into doxygen 2012-11-23 17:46:59 +01:00
Sébastien Loriot 88dd673c40 backport commit in tex file from master into doxygen 2012-11-23 17:06:47 +01:00
Eric Berberich bc7519a413 correct location 2012-11-23 16:59:37 +01:00
Sébastien Loriot 4554026ed0 backport commit in tex file from master into doxygen 2012-11-23 16:59:19 +01:00
Eric Berberich 9f4e148fff files for upcoming release (call to "makebiblio" is missing) 2012-11-23 16:58:31 +01:00
Eric Berberich 1f0a26593e 4.1 -> 4.2 and 2012 -> 2013 2012-11-23 16:49:51 +01:00