From c6013c721ec31b18c56b93b777178901d5bb69ab Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 19 Dec 2014 10:25:49 +0000
Subject: [PATCH] Updated ChangeLog and AUTHORS file for dev release

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14625 16af8721-9629-0410-8352-f15c8da7e697
---
 AUTHORS.txt |  4 +++-
 ChangeLog   | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 9926d69d3..f92335603 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,6 +1,6 @@
 OpenSceneGraph Library 3.3.3
 
-532 Contributors:
+534 Contributors:
 
 Firstname Surname
 -----------------
@@ -534,5 +534,7 @@ Alberto Jaspe
 Alan Purvis
 Alan Ott
 Alan Harris
+Aitor Moreno
 Adrien Grandemange
+Adrian Clark
 Adam Richard
diff --git a/ChangeLog b/ChangeLog
index 5f49a61a3..f89b59e4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2014-12-19 08:27  robert
+
+	* CMakeModules/FindGLIB.cmake: Added if () block to avoid script
+	  variables set to NOT-Found being used in searching
+
+2014-12-19 08:25  robert
+
+	* CMakeModules/FindLIBLAS.cmake: Fixed script warnings
+
+2014-12-18 17:47  robert
+
+	* CMakeLists.txt, CMakeModules/FindLIBLAS.cmake,
+	  src/osgPlugins/CMakeLists.txt, src/osgPlugins/las,
+	  src/osgPlugins/las/CMakeLists.txt,
+	  src/osgPlugins/las/ReaderWriterLAS.cpp: From Aitor Moreno, LAS
+	  plugin - depends upon boost and liblas and liblas-c
+
+2014-12-18 16:52  robert
+
+	* PlatformSpecifics/Android/Application.mk.master.in: From Adrian
+	  Clark, build fix for recent Android NDK using the old Android
+	  build approach.
+
+2014-12-18 15:59  robert
+
+	* CMakeLists.txt: From Mattias Helsing, "CMake have release 3.0 and
+	  3.1 and we have some bad checks for cmake
+	  major version when settings cmake policies in CMakeLists.txt.
+	  This fixes it"
+
+2014-12-18 11:36  robert
+
+	* AUTHORS.txt, applications/osgversion/Contributors.cpp: Updated
+	  AUTHORS
+
+2014-12-18 11:19  robert
+
+	* ChangeLog: Updated ChangeLog in prep for dev release
+
 2014-12-18 11:09  robert
 
 	* examples/osgmovie/CMakeLists.txt: Fixed warning