diff --git a/CMakeLists.txt b/CMakeLists.txt index 999cac8a0..6719cbf9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,13 +52,13 @@ endif() PROJECT(OpenSceneGraph) SET(OPENSCENEGRAPH_MAJOR_VERSION 3) -SET(OPENSCENEGRAPH_MINOR_VERSION 3) -SET(OPENSCENEGRAPH_PATCH_VERSION 9) -SET(OPENSCENEGRAPH_SOVERSION 123) +SET(OPENSCENEGRAPH_MINOR_VERSION 4) +SET(OPENSCENEGRAPH_PATCH_VERSION 0) +SET(OPENSCENEGRAPH_SOVERSION 130) # 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/ChangeLog b/ChangeLog index e97f7cd70..347d4111a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2015-07-02 08:57 robert + + * src/osgPlugins/osgjs/JSON_Objects: Build fix + +2015-07-02 08:52 robert + + * include/osg/GLDefines: Moved the defination of + GL_MAX_VARYING_COMPONENTS to GL_3_0 block to avoid warnings of + redefinition. + +2015-07-01 05:32 robert + + * ChangeLog: Updated ChangeLog + 2015-07-01 05:10 robert * src/osgWrappers/deprecated-dotosg/osg/ClipControl.cpp,