From 3a62b5193caaf26959242c4e636f346f00b464f2 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 23 Nov 2005 16:24:50 +0000
Subject: [PATCH] Updated AUTHORES, ChangeLog, NEWS and version number for
 1.0-rc6

---
 AUTHORS.txt   |  8 ++---
 ChangeLog     | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++
 Make/makedefs |  6 ++--
 NEWS.txt      |  4 +--
 4 files changed, 101 insertions(+), 9 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 865f57db8..267c19f9c 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -28,9 +28,9 @@ Randall Hopper
 Stephan Huber
 Michael Gronager
 Gideon May
+Chris Hanson
 Neil Salter
 Frederic Marmond
-Chris Hanson
 Boris Bralo
 Sondra Iverson
 Rune Schmidt Jensen
@@ -49,13 +49,14 @@ Sean Spicer
 Ravi Mathur
 Joseph Steel
 Joakim Simonsson
+Jason Daly
+Eric Wing
 David Spilling
 Corbin Holtz
 Toshiyuki Takahei
 Nikolaus Hanekamp
+Markus Trenkwalder
 Loic Dachary
-Jason Daly
-Eric Wing
 Bruce Clay
 Brad Christiansen
 Alberto Barbati
@@ -64,7 +65,6 @@ Sebastien Grignard
 Romano Magacho
 Roger James
 Phil Atkin
-Markus Trenkwalder
 Leandro Motta Barros
 Ken Sewell
 Julian Ortiz
diff --git a/ChangeLog b/ChangeLog
index b43d209b8..494a931d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,95 @@
+2005-11-23 15:25  robert
+
+	* src/osg/GLExtensions.cpp: Changed the linux implement of
+	  getGLExtensionFuncPtr to querry for glXGetProcAddressARB and then
+	  use this if its available, otherwise fallback to the original
+	  dlsym usage.
+
+2005-11-23 13:44  robert
+
+	* include/osg/CameraNode, src/osg/FrameBufferObject.cpp,
+	  src/osgUtil/CullVisitor.cpp, src/osgUtil/RenderStage.cpp,
+	  src/osgWrappers/osg/CameraNode.cpp: Added multi-buffering of the
+	  CameraNode::_renderingCache to help cope with multiple graphis
+	  context usages.
+
+2005-11-23 12:16  robert
+
+	* examples/osgcallback/osgcallback.cpp: Fixed mistmatch of
+	  ReadFileCallback type.
+
+2005-11-23 10:16  robert
+
+	* include/osg/GLExtensions, src/osg/GLExtensions.cpp: Moved
+	  getGLExtensionFuncPtr implementation into the .cpp to make it
+	  easier to change it implementation without forcing a complete
+	  recompile.
+
+2005-11-23 10:15  robert
+
+	* src/osgFX/BumpMapping.cpp: From Marco Jez, typo fix if GL
+	  extension name.
+
+2005-11-22 21:14  robert
+
+	* include/osgUtil/TangentSpaceGenerator, src/osgFX/BumpMapping.cpp,
+	  src/osgUtil/TangentSpaceGenerator.cpp,
+	  src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp: Simplified the
+	  TangentSpaceGenerator so that is automatically converts any
+	  models with indices to one without indices and then runs the
+	  tangent space generation code on the result.
+
+2005-11-22 14:35  robert
+
+	* Make/makedefs: From Markus Trenkwalder, fixed placment of libs in
+	  mingw build.
+
+2005-11-22 13:56  robert
+
+	* include/osg/Geometry, src/osg/Geometry.cpp: Added missing
+	  dirtyDisplayList call into osg::Geometry::set calls.
+
+2005-11-22 13:14  robert
+
+	* include/osgDB/DatabasePager, src/osgDB/DatabasePager.cpp,
+	  src/osgWrappers/osgDB/DatabasePager.cpp: Added
+	  DatabasePager::s/getDrawablePolicy() to allow the way that the
+	  display list/VBO settings are applied to loaded databases.
+
+2005-11-22 10:26  robert
+
+	* src/osg/: LOD.cpp, PagedLOD.cpp: Added check against LODScale
+	  being zero, and fixed the search for the maximum LOD range in the
+	  pixel size range fallback.
+
+2005-11-22 10:08  robert
+
+	* src/osg/: LOD.cpp, PagedLOD.cpp: From Chris Hanson, add LODScale
+	  support to pixel based LOD range selection.
+
+2005-11-22 09:57  robert
+
+	* src/osg/Program.cpp: From Jason Daly, (with small tweak by Robert
+	  Osfield) fix for Prorgram::removeShader(Shader*) so that it
+	  properly remove the shader and its entry in the _shaderList.
+
+2005-11-22 09:51  robert
+
+	* src/osgPlugins/: dxf/scene.cpp, txp/trpage_managers.cpp: From
+	  Eric Wing, warning fixes for gcc4.0/OSX.
+
+2005-11-22 09:47  robert
+
+	* include/osg/GL: From Marco Jez, fix for wchar_t being redefined.
+
+2005-11-21 16:29  robert
+
+	* NEWS.txt: Updated NEWS
+
+2005-11-21 16:15  robert
+
+	* AUTHORS.txt, ChangeLog: Updated ChangeLog and authors file.
+
 2005-11-21 13:51  robert
 
 	* include/osg/Export, include/osg/PrimitiveSet,
diff --git a/Make/makedefs b/Make/makedefs
index f5d0bd3de..7da9f6976 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -50,9 +50,9 @@ MAKEDEPEND = ignore
 ##     Command line overrides env variable
 ##               % make VERSION_REVISION=  
 ####################################################################### 
-VERSION_MAJOR    = 0
-VERSION_MINOR    = 9
-VERSION_RELEASE  = 9
+VERSION_MAJOR    = 1
+VERSION_MINOR    = 0
+VERSION_RELEASE  = 0
 VERSION_REVISION ?= 0
 ifneq (,$(OSG_VERSION_REVISION))
 VERSION_REVISION = $(OSG_VERSION_REVISION)
diff --git a/NEWS.txt b/NEWS.txt
index d666219fc..4de6284e4 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,9 +1,9 @@
 OSG News (most significant items from ChangeLog)
 ================================================
 
-21st November 2005 - OpenScneneGraph-1.0-rc5
+23rd November 2005 - OpenScneneGraph-1.0-rc6
 
->>> Long awaited Release candidate five...
+>>> Long awaited Release candidate six...
 
 Lots of stuff is new and improved, in particular render to texture support.