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
This commit is contained in:
Robert Osfield
2015-02-27 10:15:45 +00:00
parent c90cc658a0
commit 95853370e1
4 changed files with 15 additions and 6 deletions

View File

@@ -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

View File

@@ -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})

View File

@@ -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

View File

@@ -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;
}
}
}