From 840eab0109d0ca41b5c5ac2e7558196b503494cc Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 30 May 2008 21:23:49 +0000 Subject: [PATCH] Updated authors and version file for 2.5.1 dev release --- AUTHORS.txt | 39 +++++++++++++++----------- README.txt | 2 +- applications/osgversion/osgversion.cpp | 6 ++++ 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index b38c4e061..918a0a848 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,6 @@ -OpenSceneGraph Library 2.5.0 +OpenSceneGraph Library 2.5.1 -309 Contributors: +314 Contributors: Firstname Surname ----------------- @@ -17,8 +17,8 @@ Farshid Lashkari Bob Kuehne Eric Sokolowsky Ulrich Hertlein -Martin Lavery Mathias Fröhlich +Martin Lavery Tree David Callu Luigi Calori @@ -27,47 +27,49 @@ Mike Wittman Jean-Sebastien Guay Pavel Moloshtan Tom Jolley +Colin McDonald Andy Skinner Roger James Norman Vine -Colin McDonald Alberto Farre André Garneau +Wojciech Lewandowski Ruben Lopez Randall Hopper Jeremy Moles -Wojciech Lewandowski Olaf Flebbe Gideon May Don Tidrow +Art Tevs Romano José Magacho da Silva Michael Gronager Daniel Sjölie Chris Hanson -Art Tevs Per Fahlberg J.P. Delport David Spilling Sherman Wilcox +Paul Melis Joran Jessurun Jason Beverage -Paul Melis Melchior Franz Jason Daly Frederic Marmond David Fries Boris Bralo +Adrian Egli Yefei He Sondra Iverson Serge Lages Rune Schmidt Jensen Rainer Oder +Philip Lowman Mike Connell +Michael Platings Joakim Simonsson Carlo Camporesi Ben Discoe Andreas Ekstrand -Adrian Egli Sasa Bistrovic Martin Naylor Martin Aumueller @@ -81,34 +83,35 @@ Gordon Tomlinson Bryan Thrall Brad Colbert Vivek Rajan +Thibault Genessay Terry Welsh +Stephane Lamoliatte Sean Spicer Ravi Mathur -Philip Lowman Nikolaus Hanekamp Neil Salter Mihai Radu -Michael Platings Michael Hartman +Luc Frauciel Laurens Voerman David Guthrie Corbin Holtz +Cedric Pinson Brad Christiansen Toshiyuki Takahei Thom DeCarlo -Stephane Lamoliatte Simon Julier Sebastien Grignard Romano Magacho Roland Smeenk Paul de Repentigny -Luc Frauciel +Mathieu Marache Leandro Motta Barros John Kelso Glenn Waldron +Gino van den Bergen Daniel Larimer Colin Dunlop -Cedric Pinson Bruce Clay Alberto Luaces Alberto Barbati @@ -116,7 +119,6 @@ Vladimir Shabanov Uwe Woessner Tony Horrobin Tim Moore -Thibault Genessay Sohey Yamamoto Richard Schmidt Rafa Gaitan @@ -125,7 +127,6 @@ Peter Hrenka Neil Hughes Mattias Linde Mattias Helsing -Mathieu Marache Maria Ten Ken Sewell Julian Ortiz @@ -169,7 +170,6 @@ John Aughey Johan Nouvel Igor Kravtchenko Gustavo Wagner -Gino van den Bergen Gerrick Bivins George Tarantilis Fabio Mierlo @@ -177,12 +177,14 @@ Edgar Ellis David Ergo Daniel Trstenjak Csaba Halasz +Brad Anderegg Andrew Sampson Andrew Lorino Andreas Goebel Zbigniew Sroczynski Yuri Vilmanis Warren Macchi +Wang Rui Wang Lam Walter J. Altice Volker Walkiewicz @@ -199,6 +201,7 @@ Thom Carlo Tery Welsh Tatsuhiro Nishioka Tanguy Fautré +Steven Thomas Sid Byce Shuxing Xiao Shane Arnott @@ -243,10 +246,12 @@ Mario Guimaraes Marin Lavery Louis Hamilton Lewis Harmon +Lars Nilson Kristopher Bixler Karsten Weiss Karl Heijdenberg Josh Portway +John Vidar Larring John Tan John Grant John Donovan @@ -296,7 +301,6 @@ Carlos Garcea Bruno Herbelin Brian Keener Brandon Hamm -Brad Anderegg Bora Utka Blasius Czink Benoit Laniel @@ -304,6 +308,7 @@ Ben van Basten Bart Gallet Axel Volley Andrew Reyonolds +Andrew Bettison Andreas Jochens Almalric Alexandre Allen Bierbaum diff --git a/README.txt b/README.txt index 9ac6e9b39..9fc6cdab9 100644 --- a/README.txt +++ b/README.txt @@ -15,7 +15,7 @@ subscribe to our public mailing list: Robert Osfield. Project Lead. -25th April 2008. +30th May 2008. -- diff --git a/applications/osgversion/osgversion.cpp b/applications/osgversion/osgversion.cpp index 771bd3417..a3782bebd 100644 --- a/applications/osgversion/osgversion.cpp +++ b/applications/osgversion/osgversion.cpp @@ -354,6 +354,12 @@ std::string typoCorrection(const std::string& name) void nameCorrection(NamePair& name) { + if (name.first=="John" && name.second=="Vidar") + { + name.first = "John"; + name.second = "Vidar Larring"; + } + if (name.first=="Sebastien" && name.second=="Messerschmidt") { name.first = "Sebastian";