diff --git a/Doc/changelog.docu b/Doc/changelog.docu index 3adc5cfd..9b1a5c1c 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -7,6 +7,10 @@ +3.1 (?/?/?,Rev.990) + + + 3.0 (2014/02/05,Rev.990) Core diff --git a/README b/README index 5f515a2c..a04c22f9 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -OpenMesh, 3.0 +OpenMesh, 3.1 ~~~~~~~~~~~~~~~ 0. Licence diff --git a/VERSION b/VERSION index 11cde39c..c490ddf6 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ -VERSION=3.0 +VERSION=3.1 MAJOR=3 -MINOR=0 +MINOR=1 PATCH=0 ID=OPENMESH diff --git a/release.howto b/release.howto index 3c8118f9..21f3fbfa 100644 --- a/release.howto +++ b/release.howto @@ -2,7 +2,6 @@ 2. check files with release numbers: Doc/changelog.docu System/config.h - CHANGELOG README VERSION 3. Tag the current version in the svn (checkout, remove .svn readd as tag) diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h index b1a2ff49..5554bebe 100644 --- a/src/OpenMesh/Core/System/config.h +++ b/src/OpenMesh/Core/System/config.h @@ -57,7 +57,8 @@ // ---------------------------------------------------------------------------- -#define OM_VERSION 0x20400 +#define OM_VERSION 0x30000 +//#define OM_VERSION 0x20400 // only defined, if it is a beta version //#define OM_VERSION_BETA 4 @@ -68,11 +69,11 @@ #ifdef WIN32 # ifdef min -# pragma message("Detected min macro! OpenMesh does not compiled with min/max macros active! Please add a define NOMINMAX to your compiler flags or add #undef min before including OpenMesh headers !") +# pragma message("Detected min macro! OpenMesh does not compile with min/max macros active! Please add a define NOMINMAX to your compiler flags or add #undef min before including OpenMesh headers !") # error min macro active # endif # ifdef max -# pragma message("Detected max macro! OpenMesh does not compiled with min/max macros active! Please add a define NOMINMAX to your compiler flags or add #undef max before including OpenMesh headers !") +# pragma message("Detected max macro! OpenMesh does not compile with min/max macros active! Please add a define NOMINMAX to your compiler flags or add #undef max before including OpenMesh headers !") # error max macro active # endif #endif