Merged the OSG-3.0 branch versions of into svn/trunk.

LarryIII · Jun 28, 2011 · 9133a4c · 9133a4c
1 parent ae2b8c4
commit 9133a4c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/NEWS.txt b/NEWS.txt
@@ -3,7 +3,7 @@ OSG News
 
 = !OpenSceneGraph 3.0 release adds support OpenGL ES 1.1, OpenGL ES 2.0, OpenGL 3.x to 4.0, support for Andoid and IOS platforms and much more.
 
-PERTHSHIRE, Scotland - 27th June 2011 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 3.0, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 3.0 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 3.0 runs on all Microsoft Windows platforms, Apple OS/X, IOS, GNU/Linux, Android, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
+PERTHSHIRE, Scotland - 28th June 2011 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 3.0, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 3.0 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 3.0 runs on all Microsoft Windows platforms, Apple OS/X, IOS, GNU/Linux, Android, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
 
 === Open-source development delivers industry-leading features and performance ===
 The !OpenSceneGraph 3.0 release is the culmination of 12 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs.
@@ -23,8 +23,9 @@ The !OpenSceneGraph 3.0 release is the culmination of 12 years of work by the le
   * New pov plugin for exporting a scene to POV-Ray format, enabling use of POV-Ray to do photo-realistic ray tracing
   * New ply plugin for reading ply files
   * Improvements to osgText that enable bevelling of 3D text and highter quality 2D fonts
-  * Improvements to osgVolume enabling high quality race traced volume rendering
+  * Improvements to osgVolume enabling high quality ray traced volume rendering
   * Improvements to osgManipulator making it more flexible
+  * Improvements to osgParticle to support shader based particle effects
   * Revamped 3ds plugin for reading and writing of .3ds files
   * Revamped dxf plugin for reading and writing of .dxf files
   * Support for Cocoa and 64bit OSX build

diff --git a/README.txt b/README.txt
@@ -27,7 +27,7 @@ more indepth instructions.
 
 Robert Osfield.
 Project Lead.
-17th June 2011.
+28th June 2011.
 
 --
 

diff --git a/applications/osgversion/Contributors.cpp b/applications/osgversion/Contributors.cpp
@@ -321,6 +321,7 @@ TypoCorrection typoCorrections[] =
     {"Jea-Sebastien",  "Jean-Sébastien"},
     {"Jean-Sebasien",  "Jean-Sébastien"},
     {"Jean-Sebastien", "Jean-Sébastien"},
+    {"Jean-Sebestien", "Jean-Sébastien"},
     {"Johhansen",      "Johansen"},
     {"Johnansen",      "Johansen"},
     {"Johnasen",       "Johansen"},