Changes between Version 1 and Version 2 of Support/KnowledgeBase/SvnMerge

Show
Ignore:
Timestamp:
12/16/08 19:41:10 (5 years ago)
Author:
robert (IP: 217.155.192.154)
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Support/KnowledgeBase/SvnMerge

    v1 v2  
    1 Merging from branch and trunk into local check out branch: 
     1Merging trunk with branch into local check out of branch: 
    22{{{ 
    33svn merge http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk . 
    44}}} 
     5 
     6Merging branch with trunk into local check out of trunk: 
     7{{{ 
     8svn merge http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev  . 
     9}}}