From 85f79a6639e41510460aaf5af803925452980c44 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 2 Dec 2005 12:30:14 +0000
Subject: [PATCH] Updated ChangeLog, AUTHTORS.txt and osgversion for next
 release candidate.

---
 AUTHORS.txt                            |  7 ++-
 ChangeLog                              | 64 ++++++++++++++++++++++++++
 applications/osgversion/osgversion.cpp |  2 +
 3 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 56b9aee24..b5549f3e1 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -13,10 +13,10 @@ Bob Kuehne
 Brede Johansen
 Tree 
 Ulrich Hertlein
+Norman Vine
 Eric Sokolowsky
 Pavel Moloshtan
 Paul Martz
-Norman Vine
 Farshid Lashkari
 Trajce Nikolov
 Tom Jolley
@@ -51,7 +51,6 @@ Ravi Mathur
 Joseph Steel
 Joakim Simonsson
 Jason Daly
-Eric Wing
 David Spilling
 Corbin Holtz
 Toshiyuki Takahei
@@ -61,6 +60,7 @@ Loic Dachary
 Bruce Clay
 Brad Christiansen
 Alberto Barbati
+Thom DeCarlo
 Terry Welsh
 Sebastien Grignard
 Romano Magacho
@@ -80,7 +80,6 @@ Vivek Rajan
 Tugkan Calapoglu
 Tony Horrobin
 Tim Daoust
-Thom DeCarlo
 Steve Lunsford
 Stanislav Blinov
 Sohey Yamamoto
@@ -101,6 +100,7 @@ Fabio Mierlo
 Donn Mielcarek
 David Ergo
 Brad Colbert
+Ali Botorabi
 Yuri Vilmanis
 Warren Macchi
 Wang Lam
@@ -169,7 +169,6 @@ Andreas Jochens
 Andreas Ekstrand
 Anders Backman
 Allen Bierbaum
-Ali Botorabi
 Alberto Jaspe
 Alan Purvis
 Alan Ott
diff --git a/ChangeLog b/ChangeLog
index f8b0d0ca9..03282bbf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,67 @@
+2005-12-02 12:10  robert
+
+	* NEWS.txt: Fixed typos in NEWS, improved formating.
+
+2005-12-02 11:59  robert
+
+	* NEWS.txt: Updated NEWS with quotes.
+
+2005-12-02 09:57  robert
+
+	* src/osgPlugins/freetype/FreeTypeLibrary.cpp: Added a
+	  static_cast<std::streampos> to get round IRIX64 build problem.
+
+2005-12-02 00:25  robert
+
+	* include/osg/Export, include/osg/PrimitiveSet,
+	  include/osgText/String, src/osgUtil/CullVisitor.cpp,
+	  src/osgWrappers/osg/PrimitiveSet.cpp,
+	  src/osgWrappers/osgText/String.cpp: From Marco Jez, hack/fix for
+	  VS compile/link problems related to STL containers.
+
+2005-12-02 00:21  robert
+
+	* NEWS.txt: Updated NEWS
+
+2005-12-01 16:44  robert
+
+	* NEWS.txt: Updated NEWS
+
+2005-12-01 16:43  robert
+
+	* examples/: osgmultitexture/osgmultitexture.cpp,
+	  osgshaderterrain/osgshaderterrain.cpp: Added comments.
+
+2005-12-01 14:37  robert
+
+	* src/osgUtil/SceneView.cpp: From Ali Botorabi, fixed the
+	  setDefault() fallback to properly handle the case when no scene
+	  view light is requested.
+
+2005-12-01 14:09  robert
+
+	* examples/osgshaderterrain/osgshaderterrain.cpp: Added
+	  TestSupportCallback to properly handle querry of OpenGL support
+	  of vertex texturing in GLSL.
+
+2005-12-01 13:38  robert
+
+	* src/osgPlugins/txp/GNUmakefile: From Thom DeCarlo, build fix for
+	  Cygwin.
+
+2005-12-01 13:19  robert
+
+	* src/osgUtil/CullVisitor.cpp: From Geoff Michel, fixed the
+	  handling of zfar values of 0.0.
+
+2005-11-30 15:30  robert
+
+	* NEWS.txt: Updated NEWS.
+
+2005-11-29 22:29  robert
+
+	* ChangeLog: Updated changed log for 1.0-rc7.
+
 2005-11-29 18:38  robert
 
 	* src/osgPlugins/stl/ReaderWriterSTL.cpp: Added default opening of
diff --git a/applications/osgversion/osgversion.cpp b/applications/osgversion/osgversion.cpp
index a897ad4b6..8b2bb48f0 100644
--- a/applications/osgversion/osgversion.cpp
+++ b/applications/osgversion/osgversion.cpp
@@ -157,6 +157,7 @@ bool validName(const std::string& first)
     if (first=="Performer") return false;
     if (first=="Paging") return false;
     if (first=="CameraBarrierCallback") return false;
+    if (first=="TestSupportCallback") return false;
     return true;
 }
 
@@ -380,6 +381,7 @@ bool submissionsSequence(const Words& words, unsigned int& i)
         words[i]=="from" || 
         words[i]=="From:" || 
         words[i]=="from:" || 
+        words[i]=="Applied" || 
         words[i]=="Added" || 
         words[i]=="Merged" || 
         words[i]=="Integrated") return true;