diff --git a/CMakeLists.txt b/CMakeLists.txt index d8aa74118..0ef2edd33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ SET(OPENSCENEGRAPH_SOVERSION 161) # set to 0 when not a release candidate, non zero means that any generated # git tags will be treated as release candidates of given number -SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 3) +SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE) set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/ChangeLog b/ChangeLog index 58a0b169a..eed290069 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri, 31 Jan 2020 10:37:25 +0000 +Author : Robert Osfield +Added mutex lock to avoid threading issues when glyphs are added to a Font from multiple threads + +Thu, 30 Jan 2020 19:25:50 +0000 +Author : Robert Osfield +Updates for 3.6.5-rc3 + Thu, 30 Jan 2020 16:30:41 +0000 Author : OpenSceneGraph git repository Merge pull request #911 from LaurensVoerman/FbxSdkFixFix for older versions of fbxsdk without xml or zlib libraries, diff --git a/README.md b/README.md index 89e4d7d62..48e8cbc19 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ If details below are not sufficient then head over to the openscenegraph.org to Robert Osfield. Project Lead. -30th January 2020. +31th January 2020. ---