From 2f056dcaa9b30ad12cda559b3ea05755c21d81c7 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 6 Sep 2018 12:29:44 +0100
Subject: [PATCH] Updated for 3.6.3-rc1

---
 CMakeLists.txt |  2 +-
 ChangeLog      | 24 ++++++++++++++++++++++++
 README.md      |  4 ++--
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a85a5d585..24aa84181 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(OPENSCENEGRAPH_SOVERSION 158)
 
 # 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 0)
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 1)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
diff --git a/ChangeLog b/ChangeLog
index 97ffbc8ec..e0d61a943 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+Thu, 6 Sep 2018 11:50:21 +0100
+Author : Robert Osfield
+Fixed memory leak with assignment of default value to ObjectSerializer
+
+Wed, 5 Sep 2018 18:01:33 +0100
+Author : Robert Osfield
+Fixed copy constructor
+
+Wed, 5 Sep 2018 14:04:57 +0100
+Author : OpenSceneGraph git repository
+Merge pull request #617 from aluaces/Image_scaleImage_typoFix typo in the initial check of Image::scaleImage().
+
+Wed, 5 Sep 2018 13:27:35 +0200
+Author : Alberto Luaces
+Fix typo in the initial check of Image::scaleImage().
+
+Tue, 4 Sep 2018 10:35:38 -0400
+Author : Jason Beverage
+Protect the _programSet in Shader with a mutex. This prevents thread safety issues when Shader objects are used in multiple programs.
+
+Wed, 5 Sep 2018 09:33:24 +0100
+Author : Robert Osfield
+Updated ChangeLog
+
 Tue, 4 Sep 2018 15:26:30 +0100
 Author : Robert Osfield
 Changed the ShapeDrawable::build() methpd so that it does run when the ShadpwDrawabe is a KdTree.
diff --git a/README.md b/README.md
index 32b87a62b..0a840c390 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.
-29th June 2018.
+6th September 2018.
 
 ---
 
@@ -116,4 +116,4 @@ Be sure to set the THIRDPARTY_PATH to the path containing your thirdparty depend
 
 Once this completes an XCode project will have been generated in the osg root folder. Open the generated Xcode project, select the example_osgViewerIPhone target. In 'General' tab set a development team. In the 'Build Settings' tab search for 'Other Linker Flags', then for each target type (debug, release etc) that you want to use open the list of arguments and delete the 'OpenGL' line and the '-framework' line above it. This is because cmake has tried to add the desktop OpenGL library which we don't want.
 
-Once this is done you should be able to build and deploy the `example_osgViewerIPhone` target on your device.
\ No newline at end of file
+Once this is done you should be able to build and deploy the `example_osgViewerIPhone` target on your device.