songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Doc: fix a conflict-solving-bug introduced during the last "merge from master"

This commit is contained in:
Clement Jamin 2013-07-16 20:30:07 +02:00
parent 8aaee67985
commit 11fdd71222
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mesh_3/doc/Mesh_3/CGAL/Mesh_triangulation_3.h
View File

@ -3,8 +3,8 @@ namespace CGAL {
/*! /*!
\ingroup PkgMesh_3MeshClasses \ingroup PkgMesh_3MeshClasses
The class `Mesh_triangulation_3` is a metafunctor which provides the triangulation to be used as the 3D The class `Mesh_triangulation_3` is a metafunctor which provides the triangulation type to be used
triangulation of a mesh generation process. for the 3D triangulation embedding the mesh.
\tparam MD stands for a model of `MeshDomain_3`. \tparam MD stands for a model of `MeshDomain_3`.