From a0229ee684879c92ac121ed2d973de7a6c9f142a Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 14 Jul 2015 16:37:31 +0000
Subject: [PATCH] Updated ChangeLog and Release Candidate number of 3.4-rc2

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@14955 16af8721-9629-0410-8352-f15c8da7e697
---
 CMakeLists.txt |  2 +-
 ChangeLog      | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f27755ab..a6a0338f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ SET(OPENSCENEGRAPH_SOVERSION 130)
 
 # 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 1)
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 2)
 
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
 
diff --git a/ChangeLog b/ChangeLog
index 3253eab82..6cb19383c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2015-07-14 13:33  robert
+
+	* CMakeLists.txt: Moved the cmake_policy(SET CMP0043 NEW) to work
+	  for all script paths that Qt5 usage could pass through.
+
+2015-07-14 13:26  robert
+
+	* CMakeLists.txt: Added cmake_policy(SET CMP0043 NEW) usage when
+	  compiling against Qt5 as it was causing a warning we couldn't fix
+	  on the OSG side otherwise.
+
+2015-07-14 08:42  robert
+
+	* AUTHORS.txt, ChangeLog: Updated ChangeLog and AUTHORS.txt
+
+2015-07-14 08:25  robert
+
+	* src/osg/StateSet.cpp: Added _defineList into the
+	  osg::StateSet::compare() implementation to address issues with
+	  osgUtil::Optimizer ignoring defines.
+
+2015-07-13 16:09  robert
+
+	* include/osgText/Text, src/osgText/Text.cpp: Added
+	  Text::GlyphQuads::release/resizeGLObjects() and handling of
+	  inconsistent contextID sizes to avoid crashes when viewers and
+	  scene graphs aren't initialized correctly to the right number of
+	  contexts.
+
+2015-07-13 16:03  robert
+
+	* src/osgViewer/CompositeViewer.cpp, src/osgViewer/Viewer.cpp,
+	  src/osgViewer/ViewerBase.cpp: Standardize the call to
+	  setUpThreading() in CompositeViewer/Viewer::realize().
+	  
+	  Standardize the call to scene->resizeGLObjects().
+
+2015-07-13 08:48  robert
+
+	* include/osg/GLDefines: From Terry Welsh, "fThis fixes problem
+	  where new glClipControl feature would not compile for GLES2
+	  profile"
+
+2015-07-03 06:51  robert
+
+	* CMakeLists.txt: Updated version number to 3.5.0 after 3.4 branch.
+
 2015-07-03 06:28  robert
 
 	* README.txt: Updated for 3.4 branch.