From 95a5f3ed0fb05b351594b0e2acfa01f872a4c4eb Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 19 Jul 2013 14:06:11 +0000 Subject: [PATCH] Updated version number to 3.2.0-rc1 in prep for create the 3.2 branch, and 3.2.0-rc1 --- CMakeLists.txt | 6 +++--- include/osg/Version | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ad421bb2..fe46299e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,13 +47,13 @@ endif() PROJECT(OpenSceneGraph) SET(OPENSCENEGRAPH_MAJOR_VERSION 3) -SET(OPENSCENEGRAPH_MINOR_VERSION 1) -SET(OPENSCENEGRAPH_PATCH_VERSION 10) +SET(OPENSCENEGRAPH_MINOR_VERSION 2) +SET(OPENSCENEGRAPH_PATCH_VERSION 0) SET(OPENSCENEGRAPH_SOVERSION 99) # set to 0 when not a release candidate, non zero means that any generated # svn tags will be treated as release candidates of given number -SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0) +SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 1) SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) diff --git a/include/osg/Version b/include/osg/Version index 5cbc91e6c..c522806d8 100644 --- a/include/osg/Version +++ b/include/osg/Version @@ -19,8 +19,8 @@ extern "C" { #define OPENSCENEGRAPH_MAJOR_VERSION 3 -#define OPENSCENEGRAPH_MINOR_VERSION 1 -#define OPENSCENEGRAPH_PATCH_VERSION 10 +#define OPENSCENEGRAPH_MINOR_VERSION 2 +#define OPENSCENEGRAPH_PATCH_VERSION 0 #define OPENSCENEGRAPH_SOVERSION 99 /* Convenience macro that can be used to decide whether a feature is present or not i.e.