prepare 2.6

CMakeLists.txt

@@ -69,8 +69,8 @@ option(ENABLE_WRAP_JAVA "Build Java wrappers" OFF)
 option(ENABLE_WRAP_PYTHON "Build Python wrappers" ${DEFAULT})
 
 set(GMSH_MAJOR_VERSION 2)
-set(GMSH_MINOR_VERSION 5)
-set(GMSH_PATCH_VERSION 1)
+set(GMSH_MINOR_VERSION 6)
+set(GMSH_PATCH_VERSION 0)
 set(GMSH_EXTRA_VERSION "" CACHE STRING "Gmsh extra version string")
 
 set(GMSH_VERSION "${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}")
@@ -1256,7 +1256,7 @@ set(CPACK_SOURCE_GENERATOR TGZ)
 set(CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_BINARY_DIR}" "/CVS/" "/.svn" "~$" 
     "DS_Store$" "GmshConfig.h$" "GmshVersion.h$" "/benchmarks/" "/tmp/" 
     "/bin/" "/lib/" "/nightly/" "GPATH" "GRTAGS" "GSYMS" "GTAGS" "/HTML/" 
-    "/projects/")
+    "/projects/" "/FunctionSpace/")
 
 if(UNIX)
   # make sure we remove previous installs before doing the next one

doc/VERSIONS.txt

@@ -3,9 +3,9 @@ module based on ONELAB project (requires FLTK 1.3); 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
+field export; new experimental stereo+camera visualization mode; added
+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; new homology solver; Abaqus (INP) mesh export;
 bug fixes and small improvements all over the place.