From 1e94ed9fa87e8e8835e082ee75b3b3dd36108132 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 24 Jun 2011 19:45:21 +0000
Subject: [PATCH] Updated ChangeLog and AUTHORS file for 3.0.0-rc5

---
 AUTHORS.txt |  3 ++-
 ChangeLog   | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 0624ca8d5..15e425e27 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,6 +1,6 @@
 OpenSceneGraph Library 3.0.0
 
-463 Contributors:
+464 Contributors:
 
 Firstname Surname
 -----------------
@@ -362,6 +362,7 @@ Mason Menninger
 Martin von Gargern
 Martin Scheffler
 Martin Lambers
+Martin Innus
 Martin Beck
 Mario Guimaraes
 Marco Sciabica
diff --git a/ChangeLog b/ChangeLog
index d33e430a1..0ae870b13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2011-06-24 19:18  robert
+
+	* examples/osganimationskinning/osganimationskinning.cpp: Merged
+	  from svn/trunk changeset 12648, tightened up float/double usage
+
+2011-06-24 16:27  robert
+
+	* ChangeLog, NEWS.txt, README.txt: Updated ChangeLog, NEWS and
+	  READE for 3.0.0-rc5
+
+2011-06-24 16:16  robert
+
+	* src/osgPlugins/3ds/WriterNodeVisitor.cpp,
+	  src/osgPlugins/ac/Geode.cpp: Merged from svn/trunk changeset
+	  12645. Removed redundent assert and associated variables to fix
+	  warnings.
+
 2011-06-24 16:05  robert
 
 	* CMakeLists.txt: Updated release candidate number to 5 for