From e7447a46be051b36ad7be85f080d74cd53a84475 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 14 May 2009 17:25:00 +0000
Subject: [PATCH] Updated ChangeLog and AUTHOR file

---
 AUTHORS.txt | 13 +++++++------
 ChangeLog   | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index c3747a11e..3839b5977 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,6 +1,6 @@
 OpenSceneGraph Library 2.8.1
 
-370 Contributors:
+371 Contributors:
 
 Firstname Surname
 -----------------
@@ -44,11 +44,11 @@ Michael Platings
 André Garneau
 Ruben Lopez
 Randall Hopper
+Jason Daly
 J.P. Delport
 Adrian Egli
 Olaf Flebbe
 Mathieu Marache
-Jason Daly
 Gideon May
 Don Tidrow
 Sherman Wilcox
@@ -61,8 +61,8 @@ Daniel Sj
 Chris Hanson
 Alberto Luaces
 Philip Lowman
-Melchior Franz
 Chris Denham
+Melchior Franz
 Serge Lages
 Lionel Lagarde
 Joran Jessurun
@@ -77,6 +77,7 @@ Stephane Lamoliatte
 Sondra Iverson
 Rune Schmidt Jensen
 Rainer Oder
+Neil Groves
 Mike Connell
 Martin Aumueller
 Mario Valle
@@ -85,9 +86,9 @@ Gino van den Bergen
 Carlo Camporesi
 Ben Discoe
 Andreas Ekstrand
+Thibault Genessay
 Sukender 
 Sasa Bistrovic
-Neil Groves
 Martin Naylor
 Markus Trenkwalder
 Loic Dachary
@@ -98,7 +99,6 @@ Jan Ciger
 Glenn Waldron
 Brad Colbert
 Vivek Rajan
-Thibault Genessay
 Sean Spicer
 Ravi Mathur
 Peter Hrenka
@@ -203,6 +203,7 @@ Gustavo Wagner
 Guillaume Chouvenc
 Gerrick Bivins
 George Tarantilis
+Frederic Bouvier
 Ferdi Smit
 Ewe Woessner
 Erik den Dekker
@@ -323,12 +324,12 @@ Glen Waldron
 Gian Lorenzetto
 George Papagiannakis
 Galen Faidley
-Frederic Bouvier
 Frank Warmerdam
 Frank Midgley
 Frank Lindeman
 Frank Lichtenheld
 Ferdinand Cornelissen
+Fajran Iman
 Fabien Dachicourt
 Emmanuel Roche
 Edmond Gheury
diff --git a/ChangeLog b/ChangeLog
index 2915aeb67..0518678f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2009-05-14 17:18  robert
+
+	* applications/osgversion/CMakeLists.txt,
+	  applications/osgversion/Contributors.cpp,
+	  applications/osgversion/osgversion.cpp: Moved the Contributors
+	  generation code out into a separate source file that is only
+	  compiled when OSG_MAINTAINER is enable via ccamke. This has been
+	  done to prevent build issues on some machines with compilers that
+	  chose a different local to the one that the contributors names
+	  are encoded.
+
+2009-05-13 08:35  robert
+
+	* src/OpenThreads/win32, src/OpenThreads/win32/Win32Thread.cpp:
+	  From Thibault Genessay, "On Windows, when a process tries to
+	  spawn one too many thread,
+	  _beginthreadex() fails but OpenThreads still waits on the startup
+	  Block before returning to the caller of
+	  OpenThreads::Thread::start().
+	  This causes a deadlock. The return value of _beginthreadex() is
+	  actually checked, but after the call to
+	  OpenThreads::Block::block() so
+	  it is basically useless.
+	  
+	  Attached is a fix to move the check for the return value of
+	  _beginthreadex() before the call to block(), so that start() can
+	  return to the caller with a non-zero error code. This solves the
+	  problem for me."
+	  
+	  Merged from svn trunk using:
+	  
+	  svn merge -r 10190:10191
+	  http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/OpenThreads/win32
+
+2009-05-12 11:15  robert
+
+	* ChangeLog, NEWS.txt, README.txt: Updated ChangeLog and
+	  NEWS/READER for release candidate
+
 2009-05-12 11:12  robert
 
 	* src/osgWrappers/osgUtil/IntersectVisitor.cpp: Updated wrappers