Updated ChangeLog and AUTHORS file in prep for 3.4 branch.

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14935 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-07-02 10:25:14 +00:00
parent f0ac1a16f9
commit 04f4b542bd
2 changed files with 18 additions and 4 deletions

View File

@ -52,13 +52,13 @@ endif()
PROJECT(OpenSceneGraph) PROJECT(OpenSceneGraph)
SET(OPENSCENEGRAPH_MAJOR_VERSION 3) SET(OPENSCENEGRAPH_MAJOR_VERSION 3)
SET(OPENSCENEGRAPH_MINOR_VERSION 3) SET(OPENSCENEGRAPH_MINOR_VERSION 4)
SET(OPENSCENEGRAPH_PATCH_VERSION 9) SET(OPENSCENEGRAPH_PATCH_VERSION 0)
SET(OPENSCENEGRAPH_SOVERSION 123) SET(OPENSCENEGRAPH_SOVERSION 130)
# set to 0 when not a release candidate, non zero means that any generated # 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 # 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}) SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})

View File

@ -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 2015-07-01 05:10 robert
* src/osgWrappers/deprecated-dotosg/osg/ClipControl.cpp, * src/osgWrappers/deprecated-dotosg/osg/ClipControl.cpp,