From e7801ccc1e64b54e763093662b85f04138b87396 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 29 Nov 2005 14:20:37 +0000
Subject: [PATCH] Updated ChangeLog, osgversion.cpp and AUTHORS.txt for
 1.0-rc6.

---
 AUTHORS.txt                            |  1 +
 ChangeLog                              | 53 ++++++++++++++++++++++++++
 applications/osgversion/osgversion.cpp |  1 +
 3 files changed, 55 insertions(+)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 3a5b9e0a7..56b9aee24 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -43,6 +43,7 @@ Colin McDonald
 Yefei He
 Sasa Bistrovic
 Olaf Flebbe
+Eric Wing
 Ben Discoe
 Stephane Simon
 Sean Spicer
diff --git a/ChangeLog b/ChangeLog
index 4243b4b7c..2fe20df1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,56 @@
+2005-11-29 14:07  robert
+
+	* NEWS.txt: Updated NEWS with second draft of press release.
+
+2005-11-29 12:09  robert
+
+	* include/osgProducer/ViewerEventHandler,
+	  src/osgProducer/ViewerEventHandler.cpp: Added
+	  CameraBarrierCallback so that multi-thread multi-cameras are
+	  synconized correctly when do stats collection.
+
+2005-11-29 11:39  robert
+
+	* examples/osgreflect/osgreflect.cpp, src/osg/Stencil.cpp,
+	  src/osgPlugins/geo/ClipRegion.cpp, src/osgUtil/RenderBin.cpp,
+	  src/osgUtil/SceneView.cpp: From Eric Wing, fixes for "warning:
+	  converting of negative value '-0x00000000000000001' to 'unsigned
+	  int'"
+
+2005-11-29 08:59  robert
+
+	* examples/osgparametric/osgparametric.cpp: Switched off the VBO
+	  usage in osgparametric as it was tripping up ATI and 3DLabs
+	  drivers.
+
+2005-11-28 20:08  robert
+
+	* src/osg/Texture2D.cpp: Added temporary ref_ptr<osg::Image> to
+	  prevent the _image going out of scope due to another thread
+	  complete the texture::apply() while the present texture::apply()
+	  is still running.
+
+2005-11-28 10:58  robert
+
+	* examples/osgdelaunay/osgdelaunay.cpp: Fixed warning.
+
+2005-11-28 09:15  robert
+
+	* Make/makedefs, examples/osgGLUTkeyboardmouse/GNUmakefile,
+	  examples/osgGLUTkeyboardmouse/osgGLUTkeyboardmouse.cpp,
+	  examples/osgGLUTsimple/GNUmakefile,
+	  examples/osgGLUTsimple/osgGLUTsimple.cpp: From Gideon May, port
+	  to OSX of GLUT examples.
+
+2005-11-27 15:32  robert
+
+	* examples/osgdelaunay/osgdelaunay.cpp: From Geoff Michel, fix for
+	  the scaling of the random number generation.
+
+2005-11-25 20:23  robert
+
+	* AUTHORS.txt, ChangeLog: Updated ChangeLog and authors file.
+
 2005-11-25 19:18  robert
 
 	* examples/osgdelaunay/osgdelaunay.cpp,
diff --git a/applications/osgversion/osgversion.cpp b/applications/osgversion/osgversion.cpp
index 11fd8c5d1..a897ad4b6 100644
--- a/applications/osgversion/osgversion.cpp
+++ b/applications/osgversion/osgversion.cpp
@@ -156,6 +156,7 @@ bool validName(const std::string& first)
     if (first=="PolytopeVisitor") return false;
     if (first=="Performer") return false;
     if (first=="Paging") return false;
+    if (first=="CameraBarrierCallback") return false;
     return true;
 }