- Timestamp:
- 03/13/10 19:09:26 (3 years ago)
- Location:
- OpenSceneGraph/branches/OpenSceneGraph-2.8
- Files:
-
- 16 modified
-
. (modified) (1 prop)
-
src/osgPlugins (modified) (1 prop)
-
src/osgPlugins/3ds/ReaderWriter3DS.cpp (modified) (1 prop)
-
src/osgPlugins/OpenFlight (modified) (1 prop)
-
src/osgPlugins/bsp (modified) (1 prop)
-
src/osgPlugins/bsp/VBSPReader.cpp (modified) (1 prop)
-
src/osgPlugins/curl (modified) (1 prop)
-
src/osgPlugins/dxf (modified) (1 prop)
-
src/osgPlugins/dxf/dxfEntity.cpp (modified) (1 prop)
-
src/osgPlugins/hdr/hdrloader.cpp (modified) (1 prop)
-
src/osgPlugins/jpeg (modified) (1 prop)
-
src/osgPlugins/mdl (modified) (1 prop)
-
src/osgPlugins/mdl/MDLReader.cpp (modified) (1 prop)
-
src/osgPlugins/osgVolume (modified) (1 prop)
-
src/osgPlugins/pdf (modified) (1 prop)
-
src/osgPlugins/txp (modified) (1 prop)
-
OpenSceneGraph/branches/OpenSceneGraph-2.8
- Property svn:mergeinfo set to /OpenSceneGraph/branches/OpenSceneGraph-2.8.2:10664
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins:10664 1 2 /OpenSceneGraph/trunk:10539
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/3ds/ReaderWriter3DS.cpp
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/3ds/ReaderWriter3DS.cpp:10664 1 2 /OpenSceneGraph/trunk/include/osg/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9882 2 3 /OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9906
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/OpenFlight
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/OpenFlight:10664 1 2 /OpenSceneGraph/trunk/src/osgPlugins/OpenFlight:10084,10491
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bsp
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/bsp:10664 1 2 /OpenSceneGraph/trunk/src/osgPlugins/bsp:10482-10484
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bsp/VBSPReader.cpp
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/bsp/VBSPReader.cpp:10664 1 2 /OpenSceneGraph/trunk/src/osgPlugins/bsp/VBSPReader.cpp:10482-10484,10539
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/curl
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/curl:10664 1 2 /OpenSceneGraph/trunk/src/osgPlugins/curl:10222
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/dxf
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/dxf:10664 1 2 /OpenSceneGraph/trunk:9804
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/dxf/dxfEntity.cpp
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/dxf/dxfEntity.cpp:10664 1 2 /OpenSceneGraph/trunk/dxfEntity.cpp:9804 2 3 /OpenSceneGraph/trunk/src/osgPlugins/dxf/dxfEntity.cpp:9804
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/hdr/hdrloader.cpp
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/hdr/hdrloader.cpp:10664 1 2 /OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp:9801
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/jpeg
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/jpeg:10664 1 2 /OpenSceneGraph/trunk/src/osgPlugins/jpeg:10496
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/mdl
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/mdl:10664 1 2 /OpenSceneGraph/trunk/src/osgPlugins/mdl:10093,10482-10483
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/mdl/MDLReader.cpp
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/mdl/MDLReader.cpp:10664 1 2 /OpenSceneGraph/trunk/src/osgPlugins/mdl/MDLReader.cpp:10093,10482-10483,10539
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/osgVolume
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/osgVolume:10664 1 2 /OpenSceneGraph/trunk/src/osgPlugins/osgVolume:10101-10137
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/pdf
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/pdf:10664 1 2 /OpenSceneGraph/trunk/src/osgPlugins/pdf:10144
-
- Property svn:mergeinfo
-
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/txp
- Property svn:mergeinfo
-
old new 1 /OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/txp:10664 1 2 /OpenSceneGraph/trunk/src/osgPlugins/txp:10387
-
- Property svn:mergeinfo
