From 5fef9c7a7df4e45b79c282333fc85dea61807a46 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 11 Jul 2013 05:50:15 +0000
Subject: [PATCH] merge from trunk

---
 CMakeLists.txt       | 2 +-
 Mesh/meshGRegion.cpp | 2 +-
 doc/VERSIONS.txt     | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 945122535d..4a2a9ea055 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ option(ENABLE_WRAP_PYTHON "Build Python wrappers" OFF)
 
 set(GMSH_MAJOR_VERSION 2)
 set(GMSH_MINOR_VERSION 8)
-set(GMSH_PATCH_VERSION 0)
+set(GMSH_PATCH_VERSION 1)
 set(GMSH_EXTRA_VERSION "" CACHE STRING "Gmsh extra version string")
 
 set(GMSH_VERSION "${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}")
diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp
index 809307b98c..57a631fbdf 100644
--- a/Mesh/meshGRegion.cpp
+++ b/Mesh/meshGRegion.cpp
@@ -567,7 +567,7 @@ void MeshDelaunayVolume(std::vector<GRegion*> &regions)
 	       (Msg::GetVerbosity() > 6) ? 'V': '\0');
     }
     else {
-      sprintf(opts, "-Ype%c",
+      sprintf(opts, "Ype%c",
               (Msg::GetVerbosity() < 3) ? 'Q':
               (Msg::GetVerbosity() > 6) ? 'V': '\0');
       // removed -q because mesh sizes at new vertices are wrong
diff --git a/doc/VERSIONS.txt b/doc/VERSIONS.txt
index 35ed72b21a..5bbaee4b70 100644
--- a/doc/VERSIONS.txt
+++ b/doc/VERSIONS.txt
@@ -1,3 +1,5 @@
+2.8.1 (July ?, 2013): improved compound surfaces.
+
 2.8.0 (July 8, 2013): improved Delaunay point insertion; fixed mesh orientation
 of plane surfaces; fixed mesh size prescribed at embedded points; improved
 display of vectors at COG; new experimental text string display engines;
-- 
GitLab