From 68fe500f18279d4d5d4c4152f4744201bd6afefc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Mon, 27 Jul 2015 07:05:50 +0000
Subject: [PATCH] Moved main version to 4.2

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1322 fdac6126-5c0c-442c-9429-916003d36597
---
 Doc/changelog.docu                |  9 +++++++++
 README                            | 10 +++++++---
 VERSION                           |  4 ++--
 cmake/FindOpenMesh.cmake          |  1 +
 src/OpenMesh/Core/System/config.h |  2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Doc/changelog.docu b/Doc/changelog.docu
index 081924b2..07eeb864 100644
--- a/Doc/changelog.docu
+++ b/Doc/changelog.docu
@@ -6,6 +6,13 @@
 
 <!-- --------------------------------------------------------------------- -->
 
+
+<tr valign=top><td><b>4.2</b> (?/?/?,Rev.1318)</td><td>
+
+
+</tr>
+
+
 <tr valign=top><td><b>4.1</b> (2015/07/27,Rev.1318)</td><td>
 <b>Core</b>
 <ul>
@@ -24,6 +31,8 @@
 <li>Removed fixbundle calls if not building apps.</li>
 </ul>
 
+</tr>
+
 
 <tr valign=top><td><b>4.0</b> (2015/07/08,Rev.1308)</td><td>
 
diff --git a/README b/README
index 248a8b8d..3b827d1a 100644
--- a/README
+++ b/README
@@ -1,12 +1,16 @@
-OpenMesh, 4.1
+OpenMesh, 4.2
 ~~~~~~~~~~~~~~~
 
 0. Licence
 ~~~~~~~~~~~~~~~
-   see LICENSE
+   see LICENSE folder.
  
+1. Info
+~~~~~~~~~~~~~~
+All Documentation, binaries and original source code are available at www.openmesh.org
+
   
-1. Installing
+2. Installing
 ~~~~~~~~~~~~~~
 Unpack the tar-ball to a suitable place.
 
diff --git a/VERSION b/VERSION
index f22148b0..f2b46890 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
-VERSION=4.1
+VERSION=4.2
 MAJOR=4
-MINOR=1
+MINOR=2
 PATCH=0
 ID=OPENMESH
 
diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake
index 3d22dfe3..b3d6ad9a 100644
--- a/cmake/FindOpenMesh.cmake
+++ b/cmake/FindOpenMesh.cmake
@@ -63,6 +63,7 @@ IF (NOT OPENMESH_FOUND)
     "${CMAKE_SOURCE_DIR}/OpenMesh/src/OpenMesh"
     "${CMAKE_SOURCE_DIR}/libs_required/OpenMesh/src/OpenMesh"
     "${CMAKE_SOURCE_DIR}/../OpenMesh/src/OpenMesh"
+    "C:/Program Files/OpenMesh 4.2"
     "C:/Program Files/OpenMesh 4.1"
     "C:/Program Files/OpenMesh 4.0"
     "C:/Program Files/OpenMesh 3.4"
diff --git a/src/OpenMesh/Core/System/config.h b/src/OpenMesh/Core/System/config.h
index c574b1f3..56e56aed 100644
--- a/src/OpenMesh/Core/System/config.h
+++ b/src/OpenMesh/Core/System/config.h
@@ -64,7 +64,7 @@
 
 // ----------------------------------------------------------------------------
 
-#define OM_VERSION 0x40100
+#define OM_VERSION 0x40200
 
 // only defined, if it is a beta version
 //#define OM_VERSION_BETA 4
-- 
GitLab