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

AUTHORS.txt

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

CMakeLists.txt

@@ -49,11 +49,11 @@ PROJECT(OpenSceneGraph)
 SET(OPENSCENEGRAPH_MAJOR_VERSION 3)
 SET(OPENSCENEGRAPH_MINOR_VERSION 2)
 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
 # 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})
 

ChangeLog

@@ -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
 
 	* CMakeLists.txt: Fixed svn source to that it's relase candidates

include/osg/Version

@@ -21,7 +21,7 @@ extern "C" {
 #define OPENSCENEGRAPH_MAJOR_VERSION    3
 #define OPENSCENEGRAPH_MINOR_VERSION    2
 #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.
  * #if OSG_MIN_VERSION_REQUIRED(2,9,5)