From fb7f800ba79129d7211dac873aca28a7be23eb3c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 3 Jul 2014 14:20:46 +0000 Subject: [PATCH] Updated release candidate number and ChangeLog for 3.2.1-rc6 git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.2@14354 16af8721-9629-0410-8352-f15c8da7e697 --- CMakeLists.txt | 2 +- ChangeLog | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 278c5f2b6..d89a44d96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ 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 5) +SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 6) SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) diff --git a/ChangeLog b/ChangeLog index 34b5005aa..22030316f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2014-07-03 14:13 robert + + * NEWS.txt: Updated NEWS in prep for 3.2.1 release + +2014-07-03 13:06 robert + + * src/osgPlugins/osc/OscSendingDevice.cpp, + src/osgPresentation/PropertyManager.cpp: Added vertical + destructors + +2014-07-02 14:14 robert + + * src/osgPlugins/osg/ReaderWriterOSG2.cpp: Merged fix from + svn/trunk to handlng of file type of nested files within a .osgx, + .osgt and .osgb file. + +2014-07-01 07:31 robert + + * applications/osgviewer/osgviewer.cpp: Added #include + to address compile issue on some Linux distro's. + +2014-06-30 15:31 robert + + * examples/osgvolume/osgvolume.cpp: Add dds no flip on write option + to prevent output of .dds volume from being flipped by the dds + plugin. + +2014-06-30 10:22 robert + + * AUTHORS.txt, ChangeLog: Updated ChangeLog and AUTHORS file + 2014-06-30 10:13 robert * include/osgUtil/StateGraph: From Mikhail Izmestev, "Attached fix