From 5c40e9bf817cf4061969572d33e0e8d3fdd41f44 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 6 Aug 2015 15:10:55 +0000
Subject: [PATCH] Updated rc number and ChangeLog for 3.4.0-rc10

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5f254b7f..d65b9fe5f 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 9)
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 10)
 
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
 
diff --git a/ChangeLog b/ChangeLog
index 2f8a0cd3f..80b82b2ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2015-08-06 15:04  robert
+
+	* src/osgVolume/Shaders/volume_frag.cpp,
+	  src/osgVolume/Shaders/volume_iso_frag.cpp,
+	  src/osgVolume/Shaders/volume_lit_frag.cpp,
+	  src/osgVolume/Shaders/volume_lit_tf_frag.cpp,
+	  src/osgVolume/Shaders/volume_mip_frag.cpp,
+	  src/osgVolume/Shaders/volume_tf_frag.cpp,
+	  src/osgVolume/Shaders/volume_tf_iso_frag.cpp,
+	  src/osgVolume/Shaders/volume_tf_mip_frag.cpp: Merged workaround
+	  for NVidia driver/GPU bug by updating shaders from svn/trunk that
+	  change float to int usage.
+
+2015-08-06 15:03  robert
+
+	* src/osgText/Text.cpp: Added checks for the validity of chached
+	  coordinate arrays.
+
+2015-08-03 19:38  robert
+
+	* AUTHORS.txt, CMakeLists.txt, ChangeLog: Updated rc number to 9,
+	  and updated ChangeLog and AUTHORS.txt
+
 2015-08-03 19:14  robert
 
 	* include/osgViewer/api/X11/PixelBufferX11,