From afe911957cf949d500a107476ed2f371b688562f Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 17 Jul 2015 09:04:30 +0000
Subject: [PATCH] Updated ChangeLog and AUTHORS

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14977 16af8721-9629-0410-8352-f15c8da7e697
---
 AUTHORS.txt | 39 ++++++++++++++++++++-------------------
 ChangeLog   | 21 +++++++++++++++++++++
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 36a67021c..77deea81c 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,6 +1,6 @@
 OpenSceneGraph Library 3.5.0
 
-549 Contributors:
+550 Contributors:
 
 Firstname Surname
 -----------------
@@ -9,10 +9,10 @@ Don Burns
 Stephan Huber
 Paul Martz
 Farshid Lashkari
-Mathias Fröhlich
+Mathias Frhlich
 Marco Jez
 Wang Rui
-Jean-Sébastien Guay
+Jean-Sbastien Guay
 Ulrich Hertlein
 Mike Weiblen
 Sukender
@@ -63,14 +63,14 @@ Per Fahlberg
 Norman Vine
 Chris Denham
 Serge Lages
-Romano José Magacho da Silva
+Romano Jos Magacho da Silva
 Jannik Heller
 Alberto Farre
 Torben Dannhauer
 Sherman Wilcox
 Robert Michael
 Mourad Boufarguine
-André Garneau
+Andr Garneau
 Adrian Egli
 Ruben Lopez
 Randall Hopper
@@ -85,7 +85,7 @@ Martin Naylor
 Kristofer Tingdahl
 Joakim Simonsson
 David Spilling
-Daniel Sjölie
+Daniel Sjlie
 Bryan Thrall
 Rafa Gaitan
 Mike Connell
@@ -134,13 +134,13 @@ Loic Dachary
 Joseph Steel
 John Shue
 Brad Colbert
-Björn Blissing
+Bjrn Blissing
 Vivek Rajan
 Uwe Woessner
 Tony Horrobin
 Thom DeCarlo
 Tatsuhiro Nishioka
-Tanguy Fautré
+Tanguy Fautr
 Sean Spicer
 Ryan Kawicki
 Richard Schmidt
@@ -199,7 +199,7 @@ Piotr Domagalski
 Phil Atkin
 Pawel Ksiezopolski
 Nathan Monteleone
-Miha Rav¨elj
+Miha Ravelj
 Miguel Escriva
 Mattias Linde
 Mark Sciabica
@@ -231,8 +231,8 @@ Christian Ruzicka
 Christian Buchner
 Charles Cole
 Blake Williams
-Björn Hein
-Aurélien Chatelain
+Bjrn Hein
+Aurlien Chatelain
 Antoine Hue
 Andrew Bettison
 Andreas Henne
@@ -260,10 +260,11 @@ Philippe Renon
 Perry Miller
 Paul Palumbo
 Paul Obermeier
+Patrick Neary
 Nguyen Van Truong
 Nathan Cournia
 Morten Haukness
-Morné Pistorius
+Morn Pistorius
 Michael Mc Donnell
 Michael Henheffer
 Michael Guerrero
@@ -297,7 +298,7 @@ Guillaume Taze
 Guillaume Chouvenc
 Giuseppe Donvito
 Gill Peacegood
-Giampaolo Viganò
+Giampaolo Vigan
 Gerrick Bivins
 George Tarantilis
 Ferdi Smit
@@ -306,7 +307,7 @@ Eduardo Poyart
 Edgar Ellis
 Dmitry Marakasov
 Dimi Christopoulos
-Diane Delallée
+Diane Delalle
 David Longest
 David Ergo
 Daniel Trstenjak
@@ -337,7 +338,7 @@ Vasily Radostev
 Valery Bickov
 Valeriy Dubov
 Vaclav Bilek
-Tyge Løvset
+Tyge Lvset
 Troy Yee
 Tomas Hogarth
 Tomas Hnilica
@@ -382,7 +383,7 @@ Piotr Rak
 Pierre Bourdin
 Philipp Svehla
 Philipp Siemoleit
-Philipp Mächler
+Philipp Mchler
 Philip Lamb
 Petr Salinger
 Peter Bear
@@ -405,7 +406,7 @@ Nicolas Brodu
 Nick Black
 Mojtaba Fathi
 Mirko Viviani
-Mikkel Gjøl
+Mikkel Gjl
 Mike Krus
 Mike Garrity
 Michal Durkovic
@@ -507,10 +508,10 @@ David Jung
 Danny Valente
 Daniel Stien
 Dan Minor
-César L. B. Silveira
+Csar L. B. Silveira
 Cyril Brulebois
 Cory Slep
-Clément B½sch
+Clment Bsch
 Clay Fowler
 Claus Steuer
 Chuck Sembroski
diff --git a/ChangeLog b/ChangeLog
index dfda316cd..4bdf19a3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2015-07-17 08:21  robert
+
+	* CMakeLists.txt: Added cmake version check to cmake_policy usage
+
+2015-07-17 08:12  robert
+
+	* src/osgPlugins/tiff/ReaderWriterTIFF.cpp: From Patrick Neary, "To
+	  the tiff plugin, add the capability to write tiff images with
+	  unsigned short data"
+
+2015-07-16 19:17  robert
+
+	* src/osg/Image.cpp: From Patrick Neary, "Added some lesser used
+	  tokens that we use from GL_ARB_texture_rg to
+	  computeFormatDataType(), and computeNumComponents() in
+	  src/osg/Image.cpp"
+
+2015-07-16 16:06  robert
+
+	* AUTHORS.txt, ChangeLog: Updated ChangeLog and AUTHORS
+
 2015-07-16 15:49  robert
 
 	* src/osgQt/GraphicsWindowQt.cpp: From Cory Slep and Robert