From 14a683cf844c8fb180e9f057441e02824f76f54d Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 23 Sep 2011 06:19:04 +0000
Subject: [PATCH]

---
 Fltk/optionWindow.cpp |  2 +-
 doc/VERSIONS.txt      | 29 ++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index 5c361bb1d6..6ef3ede13d 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -2113,7 +2113,7 @@ optionWindow::optionWindow(int deltaFontSize)
       mesh.choice[3]->callback(mesh_options_ok_cb);
 
       mesh.choice[1] = new Fl_Choice
-        (L + 2 * WB, 2 * WB + 3 * BH, IW, BH, "2D Recombination algorithm");
+        (L + 2 * WB, 2 * WB + 3 * BH, IW, BH, "2D recombination algorithm");
       mesh.choice[1]->menu(menu_recombination_algo);
       mesh.choice[1]->align(FL_ALIGN_RIGHT);
       mesh.choice[1]->callback(mesh_options_ok_cb);
diff --git a/doc/VERSIONS.txt b/doc/VERSIONS.txt
index 496d36df09..2d9b3f60d8 100644
--- a/doc/VERSIONS.txt
+++ b/doc/VERSIONS.txt
@@ -1,12 +1,12 @@
-2.6.0 (): new tensor field visualization modes (eigenvectors,
-ellipsoid, etc.); added support for interpolation schemes in .msh
-file; added support for MED3 format; rescale viewport around visible
-entities (shift+1:1 in GUI); unified post-processing field export; new
-experimental stereo+camera visu mode; new DelQuad and Auto 2D meshing
-algorithms; experimental BAMG & MMG3D support for anisotropic mesh
-generation; new OCC cut&merge faces algorithm imported from Salome;
-new ability to connect extruded meshes to tetrahedral grids using
-pyramids; Abaqus (INP) mesh export; various bug fixes and
+2.6.0 (): new quadrilateral meshing algoroithms (Blossom and DelQuad);
+new tensor field visualization modes (eigenvectors, ellipsoid, etc.);
+added support for interpolation schemes in .msh file; added support
+for MED3 format; rescale viewport around visible entities (shift+1:1
+in GUI); unified post-processing field export; new experimental
+stereo+camera visualization mode; experimental BAMG & MMG3D support
+for anisotropic mesh generation; new OCC cut&merge algorithm imported
+from Salome; new ability to connect extruded meshes to tetrahedral
+grids using pyramids; Abaqus (INP) mesh export; various bug fixes and
 improvements.
 
 2.5.0 (Oct 15, 2010): new compound geometrical entities (for remeshing
@@ -42,12 +42,11 @@ models; fixed random triangle orientations in Delaunay and Frontal
 algorithms.
 
 2.3.0 (Jan 23, 2009): major graphics and GUI code refactoring; new
-full-quad/hexa subdivision algorithm (removed Mesh.RecombineAlgo);
-improved automatic transfinite corner selection (now also for
-volumes); improved visibility browser; new automatic adaptive
-visualization for high-order simplices; modified arrow size, clipping
-planes and transform options; many improvements and bug fixes all over
-the place.
+full-quad/hexa subdivision algorithm; improved automatic transfinite
+corner selection (now also for volumes); improved visibility browser;
+new automatic adaptive visualization for high-order simplices;
+modified arrow size, clipping planes and transform options; many
+improvements and bug fixes all over the place.
 
 2.2.6 (Nov 21, 2008): better transfinite smoothing and automatic
 corner selection; fixed high order meshing crashes on Windows and
-- 
GitLab