FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated ChangeLog, AUTHORS file, Release Candidate Number and SO version number for 3.2-rc4

Browse Source
This commit is contained in:
Robert Osfield
2013-07-23 18:34:01 +00:00
parent 14de2266ba
commit 28dd1cf8a8
4 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS.txt
View File

@@ -1,6 +1,6 @@
OpenSceneGraph Library 3.2.0 OpenSceneGraph Library 3.2.0
510 Contributors: 511 Contributors:
Firstname Surname Firstname Surname
----------------- -----------------
@@ -341,6 +341,7 @@ Ross Anderson
Ronny Krueger Ronny Krueger
Ronald van Maarseveen Ronald van Maarseveen
Romain Charbit Romain Charbit
Rocco Martino
Robert Swain Robert Swain
Rob Smith Rob Smith
Rob Radtke Rob Radtke

4
CMakeLists.txt
View File

@@ -49,11 +49,11 @@ PROJECT(OpenSceneGraph)
SET(OPENSCENEGRAPH_MAJOR_VERSION 3) SET(OPENSCENEGRAPH_MAJOR_VERSION 3)
SET(OPENSCENEGRAPH_MINOR_VERSION 2) SET(OPENSCENEGRAPH_MINOR_VERSION 2)
SET(OPENSCENEGRAPH_PATCH_VERSION 0) SET(OPENSCENEGRAPH_PATCH_VERSION 0)
SET(OPENSCENEGRAPH_SOVERSION 99) SET(OPENSCENEGRAPH_SOVERSION 100)
# 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 3) SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 4)
SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})

30
ChangeLog
View File

@@ -1,3 +1,33 @@
2013-07-23 18:11 robert
* src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp: From Rocco Martino,
build fix for compiling against ffmpeg/trunk
2013-07-23 15:36 robert
* CMakeLists.txt: Disabled the check for Asio for Windows
2013-07-23 15:28 robert
* src/osgPlugins/osc/CMakeLists.txt: Added NOT ANDROID to force use
of posix API when building for Android under Windows
2013-07-23 10:24 robert
* src/osg/Node.cpp: Added lazy setting of the UserDataContainer to
avoid unncessarily create a UserDataContain when an empty
description list is passed to Node::setDescriptions(..)
2013-07-23 09:54 robert
* src/osgPlugins/shp/XBaseParser.cpp: Fixed crash when open(..)
returns an error.
2013-07-23 05:45 robert
* AUTHORS.txt, ChangeLog: Updated ChangeLog and AUTHORS file for
rc3
2013-07-23 05:41 robert 2013-07-23 05:41 robert
* CMakeLists.txt: Fixed svn source to that it's relase candidates * CMakeLists.txt: Fixed svn source to that it's relase candidates

2
include/osg/Version
View File

@@ -21,7 +21,7 @@ extern "C" {
#define OPENSCENEGRAPH_MAJOR_VERSION 3 #define OPENSCENEGRAPH_MAJOR_VERSION 3
#define OPENSCENEGRAPH_MINOR_VERSION 2 #define OPENSCENEGRAPH_MINOR_VERSION 2
#define OPENSCENEGRAPH_PATCH_VERSION 0 #define OPENSCENEGRAPH_PATCH_VERSION 0
#define OPENSCENEGRAPH_SOVERSION 99 #define OPENSCENEGRAPH_SOVERSION 100
/* Convenience macro that can be used to decide whether a feature is present or not i.e. /* Convenience macro that can be used to decide whether a feature is present or not i.e.
* #if OSG_MIN_VERSION_REQUIRED(2,9,5) * #if OSG_MIN_VERSION_REQUIRED(2,9,5)