From 0874f126c0a702f77117789e105090f011d07a28 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 10 Aug 2015 19:58:22 +0000
Subject: [PATCH] Updated ChangeLog

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.4@15090 16af8721-9629-0410-8352-f15c8da7e697
---
 ChangeLog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 85df58cf0..493c82d47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-08-10 19:56  robert
+
+	* src/osg/State.cpp: From svn/trunk merged support for passing the
+	  GL_VENDOR string into the #pragma(tic) shader compositions
+	  defines
+
+2015-08-10 19:46  robert
+
+	* CMakeLists.txt, ChangeLog: Update RC number to 12, and updated
+	  ChangeLog
+
 2015-08-10 19:40  robert
 
 	* CMakeLists.txt: Fixed line endings