diff --git a/ChangeLog b/ChangeLog index 5f61d8be2..9ce09116e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2015-02-27 09:05 robert + + * src/osgPlugins/lua/lua-5.2.3/src/ldo.c, + src/osgPlugins/lua/lua-5.2.3/src/lgc.c, + src/osgPlugins/lua/lua-5.2.3/src/lparser.c, + src/osgPlugins/lua/lua-5.2.3/src/lstrlib.c: Fixed Windows + warnings + +2015-02-27 04:29 robert + + * examples/osgfpdepth/osgfpdepth.cpp, src/osg/State.cpp: Fixes for + warnings + +2015-02-26 20:15 robert + + * src/osgText/Text.cpp: Fixed build with auto ptr conversion + switched off + +2015-02-26 19:51 robert + + * AUTHORS.txt, ChangeLog, applications/osgversion/Contributors.cpp: + Updated AUTHORS + 2015-02-26 19:14 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; } } }