diff --git a/CMakeLists.txt b/CMakeLists.txt index b0aac6d20..ba0bbd22d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ SET(OPENSCENEGRAPH_SOVERSION 160) # 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 7) +SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 8) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE) set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/ChangeLog b/ChangeLog index d9eec3a87..7af747f52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Mon, 22 Jul 2019 17:20:10 +0100 +Author : Robert Osfield +Added handling of iOS and Android to make sure FontConfig is only used for Desktop builds + +Fri, 19 Jul 2019 09:20:50 +0100 +Author : Robert Osfield +Updated for rc7 + +Fri, 19 Jul 2019 09:10:02 +0100 +Author : OpenSceneGraph git repository +Merge pull request #797 from wangii/OpenSceneGraph-3.6 fix u64 and i64 allocation, setArray bug + +Fri, 19 Jul 2019 14:06:20 +0800 +Author : Linan Wang +fix typo + +Fri, 19 Jul 2019 13:28:25 +0800 +Author : Linan Wang +fix u64 and i64 allocation, setArray bug + Thu, 18 Jul 2019 12:44:59 +0100 Author : Robert Osfield Fixed indentation diff --git a/README.md b/README.md index d4f083dc0..5a9c0af80 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. -18th July 2019. +22nd July 2019. ---