Version 2 (modified by robert, 6 years ago)

--

Merging trunk with branch into local check out of branch:

svn merge http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk .

Merging branch with trunk into local check out of trunk:

svn merge http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev  .