From 95853370e199e8c0c9c4bcd7c06b949f184adddb Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 27 Feb 2015 10:15:45 +0000
Subject: [PATCH] Updated AUTHROS, Controbitors and rc number in prep for the
 3.2.2-rc1

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.2@14741 16af8721-9629-0410-8352-f15c8da7e697
---
 AUTHORS.txt                              | 6 +++---
 CMakeLists.txt                           | 2 +-
 ChangeLog                                | 5 +++++
 applications/osgversion/Contributors.cpp | 8 ++++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index c30485c0b..770207ae8 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -15,7 +15,7 @@ Wang Rui
 Jean-Sébastien Guay
 Ulrich Hertlein
 Mike Weiblen
-Sukender 
+Sukender
 Eric Wing
 Cedric Pinson
 Brede Johansen
@@ -30,7 +30,7 @@ Colin McDonald
 Trajce Nikolov
 Tim Moore
 Martin Lavery
-Tree 
+Tree
 Luigi Calori
 Mike Wittman
 Jason Beverage
@@ -230,7 +230,7 @@ Yuzhong Shen
 Wee See
 Warren Macchi
 Vincent Bourdier
-Terrex 
+Terrex
 Tassilo Glander
 Sylvain Marie
 Steve Lunsford
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da4d837d1..24d62042e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ SET(OPENSCENEGRAPH_SOVERSION 100)
 
 # set to 0 when not a release candidate, non zero means that any generated
 # svn tags will be treated as release candidates of given number
-SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 1)
 
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
 
diff --git a/ChangeLog b/ChangeLog
index 3ffe78c0d..745e929f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-26 20:06  robert
+
+	* AUTHORS.txt, ChangeLog, applications/osgversion/Contributors.cpp:
+	  Updated AUTHORS
+
 2015-02-26 19:13  robert
 
 	* src/osg/Image.cpp: From Bradley Baker Searles, "We had someone
diff --git a/applications/osgversion/Contributors.cpp b/applications/osgversion/Contributors.cpp
index 2c3a0268c..9fa1635f7 100644
--- a/applications/osgversion/Contributors.cpp
+++ b/applications/osgversion/Contributors.cpp
@@ -990,7 +990,9 @@ void printContributors(const std::string& changeLog, bool printNumEntries)
         cout << "-------------------------" << endl;
         for (SortedNameMap::reverse_iterator sitr = sortedNames.rbegin(); sitr != sortedNames.rend(); ++sitr)
         {
-            cout << sitr->first << "\t" << sitr->second.first << " " << sitr->second.second << endl;
+            cout << sitr->first << "\t" << sitr->second.first;
+            if (!sitr->second.second.empty()) cout << " " << sitr->second.second;
+            cout << endl;
         }
     }
     else
@@ -999,7 +1001,9 @@ void printContributors(const std::string& changeLog, bool printNumEntries)
         cout << "-----------------" << endl;
         for (SortedNameMap::reverse_iterator sitr = sortedNames.rbegin(); sitr != sortedNames.rend(); ++sitr)
         {
-            cout << sitr->second.first << " " << sitr->second.second << endl;
+            cout << sitr->second.first;
+            if (!sitr->second.second.empty()) cout << " " << sitr->second.second;
+            cout << endl;
         }
     }
 }