From 586c177db9f3be50d1404a91b7b0f24b7909908e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 30 Jun 2014 09:13:04 +0000
Subject: [PATCH] Updated ChangeLog and AUTHORS file

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.2@14333 16af8721-9629-0410-8352-f15c8da7e697
---
 AUTHORS.txt |  6 ++---
 ChangeLog   | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 0860223f3..7e36a93ea 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -25,8 +25,8 @@ Geoff Michel
 Wojciech Lewandowski
 Eric Sokolowsky
 David Callu
-Colin McDonald
 Laurens Voerman
+Colin McDonald
 Trajce Nikolov
 Tim Moore
 Martin Lavery
@@ -72,8 +72,8 @@ Andr
 Adrian Egli
 Ruben Lopez
 Randall Hopper
-Jan Ciger
 Pjotr Svetachov
+Jan Ciger
 Glenn Waldron
 Gideon May
 Don Tidrow
@@ -128,6 +128,7 @@ Joseph Steel
 Jordi Torres
 John Shue
 Brad Colbert
+Alexander Sinditskiy
 Vivek Rajan
 Uwe Woessner
 Tony Horrobin
@@ -153,7 +154,6 @@ Donn Mielcarek
 Corbin Holtz
 Blasius Czink
 Björn Blissing
-Alexander Sinditskiy
 Alexander Irion
 Toshiyuki Takahei
 Sebastien Grignard
diff --git a/ChangeLog b/ChangeLog
index 74d84fde9..0aa5b1882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,66 @@
+2014-06-30 08:55  robert
+
+	* CMakeLists.txt: Updated RC number
+
+2014-06-30 08:46  robert
+
+	* include/osg/Image: From Pjotr Svetachov, "Here is a small fix for
+	  a overflow when editing large 3d volume data."
+
+2014-06-30 08:20  robert
+
+	* src/osgPlugins/svg/ReaderWriterSVG.cpp: Removed space from
+	  #include.
+
+2014-06-30 07:39  robert
+
+	* CMakeModules/FindRSVG.cmake: Merged librsvg-2.0>=2.35 version
+	  check from svn/trunk.
+
+2014-06-30 07:37  robert
+
+	* src/osgPlugins/svg/ReaderWriterSVG.cpp: From Alexander
+	  Sinditskiy, build fix to allow building against versions older
+	  than librsvg-2.36.2
+
+2014-06-27 15:55  robert
+
+	* src/osgUtil/DelaunayTriangulator.cpp: Removed unused method.
+
+2014-06-27 15:48  robert
+
+	* src/osgUtil/Tessellator.cpp: From Laurens Voerman, "attached is a
+	  modified version of src/osgUtil/Tessellator.cpp
+	  current code checks for a Nullpointer and on notify level info or
+	  above will inform you with a crash, by dereferencing it."
+
+2014-06-27 15:39  robert
+
+	* AUTHORS.txt: Updated AUTHORS file
+
+2014-06-27 15:38  robert
+
+	* src/osg/ApplicationUsage.cpp: Added a render order sort to the
+	  list of Cameras being tested by the
+	  *Viewer::generatePointerData(..) method to ensure that the
+	  highest Camera gets focus.
+
+2014-06-27 15:30  robert
+
+	* include/osg/Camera, src/osg/GraphicsContext.cpp,
+	  src/osgViewer/CompositeViewer.cpp, src/osgViewer/Viewer.cpp:
+	  Added a render order sort to the list of Cameras being tested by
+	  the *Viewer::generatePointerData(..) method to ensure that the
+	  highest Camera gets focus.
+
+2014-06-27 15:26  robert
+
+	* AUTHORS.txt: Updated AUTHORS file
+
+2014-06-26 15:54  robert
+
+	* ChangeLog: Updated ChangeLog for 3.2.1-rc4
+
 2014-06-26 15:18  robert
 
 	* CMakeLists.txt: Updated RC number to 4.