From 60746206f148a9a680f258b43dd99ffcba087d59 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 28 Jul 2011 16:59:15 +0000
Subject: [PATCH] Updated ChangeLog and release candidate number for 3.0.1-rc3

---
 AUTHORS.txt    |  4 ++--
 CMakeLists.txt |  2 +-
 ChangeLog      | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index e1fc25033..658fee40b 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -36,8 +36,8 @@ Roland Smeenk
 Roger James
 Jeremy Moles
 Chris Hanson
-Mattias Helsing
 Jason Beverage
+Mattias Helsing
 Jan Peciva
 Andy Skinner
 Paul Melis
@@ -116,6 +116,7 @@ Loic Dachary
 Joseph Steel
 Jorge Izquierdo
 John Shue
+Johannes Baeuerle
 Chuck Seberino
 Brad Colbert
 Vivek Rajan
@@ -133,7 +134,6 @@ Mihai Radu
 Michael Hartman
 Martins Innus
 Maciej Krol
-Johannes Baeuerle
 Johan Nouvel
 Hartwig Wiesmann
 Frederic Bouvier
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a45d61ec..97c3e9bf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ SET(OPENSCENEGRAPH_SOVERSION 80)
 
 # set to 0 when not a release candidate, non zero means that any generated 
 # svn tags will be treated as release candidates of given number
-SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 2)
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 3)
 
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
 
diff --git a/ChangeLog b/ChangeLog
index b1e2eb765..8bead8bbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+2011-07-28 16:41  robert
+
+	* src/osgPlugins/dicom/ReaderWriterDICOM.cpp: Improved the handling
+	  of scaling of dicom imagery.
+
+2011-07-28 12:08  robert
+
+	* src/osgViewer/GraphicsWindowX11.cpp: Merged from svn/trunk
+	  revision 12722. Refectored the EGL setup so that it's honours the
+	  Traits values.
+
+2011-07-28 11:05  robert
+
+	* src/osg/Texture.cpp, src/osgWrappers/serializers/osg/Texture.cpp:
+	  Merged from svn/trunk, revision 12727, Reverted the change to the
+	  default setting of _resizeNonPowerOfTwoHint back to true for all
+	  platforms to ensure the
+	  same behaivour across platforms, something that can be achieved
+	  now thanks to the integrated GLU library.
+	  
+	  Corrected the default of the ResizeNonPowerOfTwoHint to true to
+	  reflect the actual default setting set by the
+	  Texture default constructor.
+
+2011-07-28 08:19  robert
+
+	* src/osgDB/ObjectWrapper.cpp: From Johannes Baeuerle, merged from
+	  svn/trunk revision 12725, "in the file
+	  src/osgDB/ObjectWrapper.cpp, where the GlobalLookupTable for gl
+	  enums for serialization purposes is defined, some of the
+	  compressed texture formats are missing. I added enums for the pvr
+	  and etc formats."
+
+2011-07-28 07:47  robert
+
+	* src/osgViewer/View.cpp: From Jason Beverage, merged from
+	  svn/trunk revision 12723, "Here is a small fix for
+	  getCameraContainingPosition. getXMin was
+	  being used in a case where getYMin should be used instead."
+
+2011-07-25 19:28  robert
+
+	* AUTHORS.txt, ChangeLog: Updated ChangeLog and AUTHORS file for
+	  3.0.1-rc2
+
 2011-07-25 18:39  robert
 
 	* CMakeLists.txt: Updated release candidate number