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:
2 modified

  • 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/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