From 1ef313787dc642669465fe880b68acc97f501efa Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 22 Jun 2011 16:34:46 +0000
Subject: [PATCH] Update ChangeLog and AUTHORs file for 3.0.0-rc3

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

diff --git a/AUTHORS.txt b/AUTHORS.txt
index a187ee5c5..dbdd1338e 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -52,6 +52,7 @@ Norman Vine
 Art Tevs
 Alberto Luaces
 Serge Lages
+Magnus Kessler
 Laurens Voerman
 Alberto Farre
 Terry Welsh
@@ -59,7 +60,6 @@ Sherman Wilcox
 Robert Milharcic
 Olaf Flebbe
 Mathieu Marache
-Magnus Kessler
 André Garneau
 Adrian Egli
 Ruben Lopez
diff --git a/ChangeLog b/ChangeLog
index 5b21fb646..6d3bc7c1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2011-06-22 16:18  robert
+
+	* CMakeModules/FindCOLLADA.cmake: From Magnus Kessler, "I have
+	  recently installed the latest version of collada-dom on Linux,
+	  and
+	  found that the include path has changed. By default, collada-dom
+	  now installs
+	  its header files under /usr/local/include/collada-dom
+	  or/usr/include/collada-
+	  dom. The attached FindCollada.cmake has been updated to look for
+	  these
+	  locations in addition to the previous candidate locations."
+
+2011-06-22 15:41  robert
+
+	* AUTHORS.txt, ChangeLog: Updated ChangeLog and AUTHORS file for
+	  release
+
 2011-06-22 12:45  robert
 
 	* CMakeLists.txt: Updated RC number for the 3.0.0-rc3