Changeset 11243

Show
Ignore:
Timestamp:
03/17/10 20:02:38 (2 years ago)
Author:
paulmartz
Message:

2.8 branch: This is part II of the new ply plugin. This commit merges the following trunk revisions: 10088, 10149, and 11237

Location:
OpenSceneGraph/branches/OpenSceneGraph-2.8
Files:
49 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/branches/OpenSceneGraph-2.8

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2:10664 
        2 /OpenSceneGraph/trunk:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/applications/osgarchive/osgarchive.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/applications/osgarchive/osgarchive.cpp:10664 
        2 /OpenSceneGraph/trunk/applications/osgarchive/osgarchive.cpp:9769,9810,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/applications/osgarchive/osgarchive.cpp:9769,9810,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/examples

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/examples:10664 
        2 /OpenSceneGraph/trunk/examples:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10064,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11009,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/examples:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10064,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11009,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/examples/osgcluster/broadcaster.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/examples/osgcluster/broadcaster.cpp:10664 
        2 /OpenSceneGraph/trunk/examples/osgcluster/broadcaster.cpp:9769,9816-9818,9826-9828,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10064,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11009,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/examples/osgcluster/broadcaster.cpp:9769,9816-9818,9826-9828,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10064,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11009,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/include/osg

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/include/osg:10664 
        2 /OpenSceneGraph/trunk/include/osg:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10228,10264,10283,10340,10410,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/include/osg:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10228,10264,10283,10340,10410,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/include/osgAnimation

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/trunk:9646-11206 
        2 /OpenSceneGraph/trunk/include/osgAnimation:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/include/osgAnimation:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/OpenThreads/pthreads

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/OpenThreads/pthreads:10664 
        2 /OpenSceneGraph/trunk/src/OpenThreads/pthreads:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10219,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/OpenThreads/pthreads:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10219,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/OpenThreads/win32

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/OpenThreads/win32:10664 
        2 /OpenSceneGraph/trunk/src/OpenThreads/win32:9769,9816-9818,9826-9827,9832,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10191,10208,10264,10283,10340,10417,10440,10456-10457,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/OpenThreads/win32:9769,9816-9818,9826-9827,9832,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10191,10208,10264,10283,10340,10417,10440,10456-10457,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg:10664 
        22/OpenSceneGraph/trunk:10327 
        3 /OpenSceneGraph/trunk/src/osg:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         3/OpenSceneGraph/trunk/src/osg:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Drawable.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/Drawable.cpp:10664 
        22/OpenSceneGraph/trunk/include/osg/src/osg/Drawable.cpp:9882 
        3 /OpenSceneGraph/trunk/src/osg/Drawable.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9897,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         3/OpenSceneGraph/trunk/src/osg/Drawable.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9897,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Geometry.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/Geometry.cpp:10664 
        22/OpenSceneGraph/trunk/include/osg/src/osg/Geometry.cpp:9882 
        3 /OpenSceneGraph/trunk/src/osg/Geometry.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9900,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         3/OpenSceneGraph/trunk/src/osg/Geometry.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9900,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/GraphicsContext.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/GraphicsContext.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10154,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10154,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Image.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/Image.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osg/Image.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10062,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osg/Image.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10062,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Node.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/Node.cpp:10664 
        22/OpenSceneGraph/trunk/include/osg/src/osg/Node.cpp:9882 
        3 /OpenSceneGraph/trunk/src/osg/Node.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9897,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         3/OpenSceneGraph/trunk/src/osg/Node.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9897,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/PolygonOffset.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/PolygonOffset.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osg/PolygonOffset.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10083-10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osg/PolygonOffset.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10083-10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/State.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/State.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osg/State.cpp:9769,9798,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osg/State.cpp:9769,9798,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgAnimation

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/trunk:9646-11206 
        2 /OpenSceneGraph/trunk/src/osgAnimation:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgAnimation:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgDB:10664 
        2 /OpenSceneGraph/trunk/src/osgDB:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10150,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgDB:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149-10150,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB/CMakeLists.txt

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgDB/CMakeLists.txt:10664 
        22/OpenSceneGraph/trunk/include/osg/src/osgDB/CMakeLists.txt:9882 
        3 /OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9922,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10150,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         3/OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9922,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149-10150,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB/DatabasePager.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgDB/DatabasePager.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10054,10057,10076,10079-10080,10084,10150,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10054,10057,10076,10079-10080,10084,10088,10149-10150,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgManipulator

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgManipulator:10664 
        2 /OpenSceneGraph/trunk/src/osgManipulator:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10358,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgManipulator:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10358,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins:10664 
        22/OpenSceneGraph/trunk:10539 
        3 /OpenSceneGraph/trunk/src/osgPlugins:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         3/OpenSceneGraph/trunk/src/osgPlugins:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/3ds/ReaderWriter3DS.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/3ds/ReaderWriter3DS.cpp:10664 
        22/OpenSceneGraph/trunk/include/osg/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9882 
        3 /OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         3/OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/3ds/readwrite.cpp

    r11241 r11243  
    374374{ 
    375375  ASSERT(strm); 
    376   strm->write((char*)b,1); 
     376  strm->write((const char*)b,1); 
    377377  if (strm->fail()) { 
    378378    return(LIB3DS_FALSE); 
    … …  
    401401  b[0]=(Lib3dsByte)((Lib3dsWord)w & 0x00FF); 
    402402 
    403   strm->write((char*)b,2); 
     403  strm->write((const char*)b,2); 
    404404  if (strm->fail()) { 
    405405    return(LIB3DS_FALSE); 
    … …  
    430430  b[0]=(Lib3dsByte)(((Lib3dsDword)d & 0x000000FF)); 
    431431 
    432   strm->write((char*)b,4); 
     432  strm->write((const char*)b,4); 
    433433  if (strm->fail()) { 
    434434    return(LIB3DS_FALSE); 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/OpenFlight

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/OpenFlight:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/OpenFlight:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgPlugins/OpenFlight:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bsp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/bsp:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/bsp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10482-10484,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgPlugins/bsp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10482-10484,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bsp/VBSPReader.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/bsp/VBSPReader.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/bsp/VBSPReader.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10482-10484,10487,10491,10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgPlugins/bsp/VBSPReader.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10482-10484,10487,10491,10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bvh

    • Property svn:mergeinfo

      •  

        old new  
        22/OpenSceneGraph/trunk:11009 
        33/OpenSceneGraph/trunk/bvh:10539 
        4 /OpenSceneGraph/trunk/src/osgPlugins/bvh:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         4/OpenSceneGraph/trunk/src/osgPlugins/bvh:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/curl

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/curl:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/curl:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10222,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgPlugins/curl:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10222,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/dxf

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/dxf:10664 
        22/OpenSceneGraph/trunk:9804 
        3 /OpenSceneGraph/trunk/src/osgPlugins/dxf:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         3/OpenSceneGraph/trunk/src/osgPlugins/dxf:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/dxf/dxfEntity.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/dxf/dxfEntity.cpp:10664 
        22/OpenSceneGraph/trunk/dxfEntity.cpp:9804 
        3 /OpenSceneGraph/trunk/src/osgPlugins/dxf/dxfEntity.cpp:9769,9804,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         3/OpenSceneGraph/trunk/src/osgPlugins/dxf/dxfEntity.cpp:9769,9804,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp

    r11242 r11243  
    168168            // Find out the frame pts 
    169169 
    170             if (packet.packet.dts == AV_NOPTS_VALUE && m_frame->opaque != 0 && *reinterpret_cast<const int64_t*>(m_frame->opaque) != AV_NOPTS_VALUE) 
     170            if (packet.packet.dts == AV_NOPTS_VALUE && 
     171                m_frame->opaque != 0 && 
     172                *reinterpret_cast<const int64_t*>(m_frame->opaque) != AV_NOPTS_VALUE) 
    171173            { 
    172174                pts = *reinterpret_cast<const int64_t*>(m_frame->opaque); 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/hdr/hdrloader.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/hdr/hdrloader.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp:9769,9801,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp:9769,9801,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/jpeg

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/jpeg:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/jpeg:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10496,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgPlugins/jpeg:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10496,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/mdl

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/mdl:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/mdl:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10093,10208,10264,10283,10340,10417,10440,10456,10482-10483,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgPlugins/mdl:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10093,10149,10208,10264,10283,10340,10417,10440,10456,10482-10483,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/mdl/MDLReader.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/mdl/MDLReader.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/mdl/MDLReader.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10093,10208,10264,10283,10340,10417,10440,10456,10482-10483,10487,10491,10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgPlugins/mdl/MDLReader.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10093,10149,10208,10264,10283,10340,10417,10440,10456,10482-10483,10487,10491,10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/osgAnimation

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/trunk:9646-10557 
        22/OpenSceneGraph/trunk/osgAnimation:10539 
        3 /OpenSceneGraph/trunk/src/osgPlugins/osgAnimation:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         3/OpenSceneGraph/trunk/src/osgPlugins/osgAnimation:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/osgVolume

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/osgVolume:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/osgVolume:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10101-10137,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgPlugins/osgVolume:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10101-10137,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/pdf

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/pdf:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/pdf:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10144,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgPlugins/pdf:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10144,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/txp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/txp:10664 
        2 /OpenSceneGraph/trunk/src/osgPlugins/txp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10387,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgPlugins/txp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10387,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgSim

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgSim:10664 
        2 /OpenSceneGraph/trunk/src/osgSim:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10321,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgSim:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10321,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgTerrain

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgTerrain:10664 
        2 /OpenSceneGraph/trunk/src/osgTerrain:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10230,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgTerrain:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10230,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgText/TextBase.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgText/TextBase.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgText/TextBase.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10376,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgText/TextBase.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10376,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgUtil/Optimizer.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgUtil/Optimizer.cpp:10664 
        22/OpenSceneGraph/trunk/include/osg/src/osgUtil/Optimizer.cpp:9882 
        3 /OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9902,9906,9920,9932,9959,9987,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10480,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         3/OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9902,9906,9920,9932,9959,9987,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10480,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgUtil/RenderStage.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgUtil/RenderStage.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp:9769,9816-9818,9822,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp:9769,9816-9818,9822,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgViewer

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgViewer:10664 
        2 /OpenSceneGraph/trunk/src/osgViewer:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10147,10208,10264,10283,10340,10364-10365,10417,10440,10456,10460,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgViewer:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10147,10149,10208,10264,10283,10340,10364-10365,10417,10440,10456,10460,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgViewer/GraphicsWindowWin32.cpp

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgViewer/GraphicsWindowWin32.cpp:10664 
        2 /OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowWin32.cpp:9769,9816-9818,9824,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10147,10208,10264,10283,10340,10364-10365,10417,10440,10456,10460,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowWin32.cpp:9769,9816-9818,9824,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10147,10149,10208,10264,10283,10340,10364-10365,10417,10440,10456,10460,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgVolume

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgVolume:10664 
        2 /OpenSceneGraph/trunk/src/osgVolume:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10101-10137,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgVolume:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10101-10137,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237 

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgWidget

    • Property svn:mergeinfo

      •  

        old new  
        11/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgWidget:10664 
        2 /OpenSceneGraph/trunk/src/osgWidget:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10182,10208,10264,10283,10340,10417,10440,10456,10487,10489,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175 
         2/OpenSceneGraph/trunk/src/osgWidget:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854,9856-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10149,10182,10208,10264,10283,10340,10417,10440,10456,10487,10489,10491,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10818,10854-10855,10858,10887,10891,10923,10933,11019,11032,11034-11035,11111,11127,11131,11159,11175,11237