From 96d247aa7ef8080c6f48826c9da400a878e93a96 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 10 Aug 2015 19:46:19 +0000
Subject: [PATCH] Update RC number to 12, and updated ChangeLog

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 394a9b823..6c4d4bf6e 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 11)
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 12)
 
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
 
diff --git a/ChangeLog b/ChangeLog
index 129e27626..85df58cf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2015-08-10 19:40  robert
+
+	* CMakeLists.txt: Fixed line endings
+
+2015-08-10 19:39  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: Updated built-in
+	  shaders from OpenSceneGraph-Data vesion that introduce
+	  #pragma(tic) shaders that resolve the NVidia loop iteration bug.
+
+2015-08-10 19:19  robert
+
+	* src/osg/Shader.cpp: Quietened down #pragma(tic) shader
+	  composition messages
+
+2015-08-10 05:04  robert
+
+	* include/osg/Types, src/osg/CMakeLists.txt: Build fix for VS and
+	  installing TYpes
+
+2015-08-09 10:20  robert
+
+	* AUTHORS.txt, ChangeLog: Update ChangeLog and AUTHORS for rc11
+
 2015-08-09 10:16  robert
 
 	* CMakeLists.txt: Updated RC number to 11.