| commit b73fbeb3b7
| Merge: 619a69ff22cbb5
| Author: Jane Tournois <Jane.Tournois@sophia.inria.fr>
| Date: Mon Aug 20 15:52:37 2012 +0000
|
| merge from next
|
| Notes:
| r71385 branches/features/Mesh_3-improvements-GF
The merge is not reverted, but the following extra patch is reverted:
| --- a/Manual_tools/install.config
| +++ b/Manual_tools/install.config
| @@@ -1,7 -1,7 +1,5 @@@
| # feel free to edit the paths as you like
| --
| --export LATEX_CONV_BIN=$HOME/local/bin
| --
| --MANUAL_TOOLS_PREFIX=$HOME/local/Manual_tools
| ++export LATEX_CONV_BIN=$CGAL_MISC/manual/bin
| ++MANUAL_TOOLS_PREFIX=$CGAL_MISC/manual
| export LATEX_CONV_CONFIG=$MANUAL_TOOLS_PREFIX/latex_conv_config
| export STYLE_FILES=$MANUAL_TOOLS_PREFIX/sty