Changeset 11249

Show
Ignore:
Timestamp:
03/18/10 17:18:46 (4 years ago)
Author:
paulmartz
Message:

2.8 branch: Updated FindInventor?.cmake from trunk revision 11033.

Location:
OpenSceneGraph/branches/OpenSceneGraph-2.8
Files:
48 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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/CMakeModules/FindInventor.cmake

    r7830 r11249  
    1 # - Locate Inventor 
     1# 
     2# Find Open Inventor 
     3# 
    24# This module defines: 
    35#  INVENTOR_FOUND, if false, do not try to link against Inventor. 
     
    57#  INVENTOR_LIBRARY, the library to link against. 
    68#  INVENTOR_LIBRARY_DEBUG, the debug library to link against. 
    7  
     9#  INVENTOR_SOWIN_LIBRARY, the SoWin library - window binding library for Inventor 
     10#  INVENTOR_SOWIN_LIBRARY, the SoWin debug library 
     11#  INVENTOR_SOXT_LIBRARY, the SoXt library - window binding library for Inventor 
     12#  INVENTOR_SOXT_LIBRARY, the SoXt debug library 
     13# 
     14 
     15 
     16# 
     17#  Inventor 
     18# 
     19#  notes: 
     20#  - Coin is honored over SGI Inventor 
     21#  - Coin is detected by coin-config script, COINDIR environment variable, 
     22#    and finally standard system locations are searched 
     23#  - SGI Inventor is searched at standard system locations only 
     24# 
     25 
     26# coin-config tells much of Coin instalation (if present) 
     27execute_process (COMMAND coin-config --prefix 
     28                 OUTPUT_VARIABLE COIN_PREFIX 
     29                 OUTPUT_STRIP_TRAILING_WHITESPACE) 
     30 
     31# try to find Inventor includes (priority paths) 
     32FIND_PATH(INVENTOR_INCLUDE_DIR Inventor/So.h 
     33    ${COIN_PREFIX}/include 
     34    $ENV{COINDIR}/include 
     35    NO_DEFAULT_PATH 
     36) 
     37 
     38# try to find Inventor includes (regular paths) 
    839FIND_PATH(INVENTOR_INCLUDE_DIR Inventor/So.h 
    940    /usr/local/include 
     
    1344    /opt/csw/include 
    1445    /opt/include 
    15     $ENV{COINDIR}/include 
    16 ) 
    17  
    18 FIND_LIBRARY(INVENTOR_LIBRARY 
    19     NAMES coin2 Coin 
    20     PATHS 
     46) 
     47 
     48# default Inventor lib search paths 
     49SET(INVENTOR_LIB_SEARCH_PATH 
    2150    /usr/local/lib 
    2251    /usr/lib 
     
    2554    /opt/csw/lib 
    2655    /opt/lib 
    27     $ENV{COINDIR}/lib 
    28 ) 
    29 IF(NOT INVENTOR_LIBRARY) 
    30     # If we can't find libCoin try libInventor 
    31     FIND_LIBRARY(INVENTOR_LIBRARY 
    32         NAMES Inventor 
    33         PATHS 
    34         /usr/local/lib 
    35         /usr/lib 
    36         /sw/lib 
    37         /opt/local/lib 
    38         /opt/csw/lib 
    39         /opt/lib 
    40     ) 
    41 ENDIF(NOT INVENTOR_LIBRARY) 
    42  
     56) 
     57 
     58# try to find Coin release lib (priority paths) 
     59FIND_LIBRARY(INVENTOR_LIBRARY_RELEASE 
     60    NAMES coin5 coin4 coin3 coin2 coin1 Coin 
     61    PATHS ${COIN_PREFIX}/lib 
     62          $ENV{COINDIR}/lib 
     63    NO_DEFAULT_PATH 
     64) 
     65 
     66# try to find Coin release lib (regular paths) 
     67FIND_LIBRARY(INVENTOR_LIBRARY_RELEASE 
     68    NAMES coin5 coin4 coin3 coin2 coin1 Coin 
     69    PATHS ${INVENTOR_LIB_SEARCH_PATH} 
     70) 
     71 
     72# try to find SGI Inventor lib 
     73FIND_LIBRARY(INVENTOR_LIBRARY_RELEASE 
     74    NAMES Inventor 
     75    PATHS ${INVENTOR_LIB_SEARCH_PATH} 
     76) 
     77 
     78# try to find Coin debug lib (priority paths) 
    4379FIND_LIBRARY(INVENTOR_LIBRARY_DEBUG 
    44     NAMES coin2d 
    45     PATHS 
    46     /usr/local/lib 
    47     /usr/lib 
    48     /sw/lib 
    49     /opt/local/lib 
    50     /opt/csw/lib 
    51     /opt/lib 
    52     $ENV{COINDIR}/lib 
    53 ) 
    54 IF(NOT INVENTOR_LIBRARY_DEBUG) 
    55     IF(INVENTOR_LIBRARY) 
    56         SET(INVENTOR_LIBRARY_DEBUG ${INVENTOR_LIBRARY}) 
    57     ENDIF(INVENTOR_LIBRARY) 
    58 ENDIF(NOT INVENTOR_LIBRARY_DEBUG) 
    59  
     80    NAMES coin5d coin4d coin3d coin2d coin1d 
     81    PATHS ${COIN_PREFIX}/lib 
     82          $ENV{COINDIR}/lib 
     83    NO_DEFAULT_PATH 
     84) 
     85 
     86# try to find Coin debug lib (regular paths) 
     87FIND_LIBRARY(INVENTOR_LIBRARY_DEBUG 
     88    NAMES coin5d coin4d coin3d coin2d coin1d 
     89    PATHS ${INVENTOR_LIB_SEARCH_PATH} 
     90) 
     91 
     92# set release to debug if only debug found 
     93IF(NOT INVENTOR_LIBRARY_RELEASE AND INVENTOR_LIBRARY_DEBUG) 
     94  SET(INVENTOR_LIBRARY_RELEASE ${INVENTOR_LIBRARY_DEBUG}) 
     95ENDIF(NOT INVENTOR_LIBRARY_RELEASE AND INVENTOR_LIBRARY_DEBUG) 
     96 
     97# set debug to release (if only release found) 
     98IF(NOT INVENTOR_LIBRARY_DEBUG AND INVENTOR_LIBRARY_RELEASE) 
     99  SET(INVENTOR_LIBRARY_DEBUG ${INVENTOR_LIBRARY_RELEASE}) 
     100ENDIF(NOT INVENTOR_LIBRARY_DEBUG AND INVENTOR_LIBRARY_RELEASE) 
     101 
     102# INVENTOR_LIBRARY 
     103IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) 
     104  SET(INVENTOR_LIBRARY 
     105      optimized ${INVENTOR_LIBRARY_RELEASE} 
     106      debug ${INVENTOR_LIBRARY_DEBUG}) 
     107ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) 
     108  SET(INVENTOR_LIBRARY 
     109      ${INVENTOR_LIBRARY_RELEASE}) 
     110ENDIF(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) 
     111 
     112# set INVENTOR_FOUND appropriately 
    60113SET(INVENTOR_FOUND "NO") 
    61114IF(INVENTOR_INCLUDE_DIR AND INVENTOR_LIBRARY) 
    62115    SET(INVENTOR_FOUND "YES") 
    63116ENDIF(INVENTOR_INCLUDE_DIR AND INVENTOR_LIBRARY) 
     117 
     118 
     119# 
     120#  SoWin 
     121# 
     122# notes: SoWin is searched by COINDIR environment variable 
     123#        (as expected to be located at Windows platform) 
     124 
     125# try to find SoWin lib (priority paths) 
     126FIND_LIBRARY(INVENTOR_SOWIN_LIBRARY 
     127    NAMES sowin1 
     128    PATHS $ENV{COINDIR}/lib 
     129    NO_DEFAULT_PATH 
     130) 
     131 
     132# try to find SoWin lib (regular paths) 
     133FIND_LIBRARY(INVENTOR_SOWIN_LIBRARY 
     134    NAMES sowin1 
     135    PATHS ${INVENTOR_LIB_SEARCH_PATH} 
     136) 
     137 
     138# try to find SoWin debug lib (priority paths) 
     139FIND_LIBRARY(INVENTOR_SOWIN_LIBRARY_DEBUG 
     140    NAMES sowin1d 
     141    PATHS $ENV{COINDIR}/lib 
     142    NO_DEFAULT_PATH 
     143) 
     144 
     145# try to find SoWin debug lib (regular paths) 
     146FIND_LIBRARY(INVENTOR_SOWIN_LIBRARY_DEBUG 
     147    NAMES sowin1d 
     148    PATHS ${INVENTOR_LIB_SEARCH_PATH} 
     149) 
     150 
     151# SoWin debug library defaults to non-debug lib 
     152IF(NOT INVENTOR_SOWIN_LIBRARY_DEBUG) 
     153    IF(INVENTOR_SOWIN_LIBRARY) 
     154        SET(INVENTOR_SOWIN_LIBRARY_DEBUG INVENTOR_SOWIN_LIBRARY) 
     155    ENDIF(INVENTOR_SOWIN_LIBRARY) 
     156ENDIF(NOT INVENTOR_SOWIN_LIBRARY_DEBUG) 
     157 
     158 
     159# 
     160#  SoXt 
     161# 
     162#  notes: 
     163#  - SoXt is detected by soxt-config script (as expected by 
     164#    Coin's SoXt on Linux/Unix) and on standard system locations 
     165#  - SGI's InventorXt support is missing now 
     166# 
     167 
     168# soxt-config tells much of SoXt instalation (if present) 
     169execute_process (COMMAND soxt-config --prefix 
     170                 OUTPUT_VARIABLE SOXT_PREFIX 
     171                 OUTPUT_STRIP_TRAILING_WHITESPACE) 
     172 
     173# try to find SoXt lib (priority paths) 
     174FIND_LIBRARY(INVENTOR_SOXT_LIBRARY 
     175    NAMES soxt1 SoXt 
     176    PATHS ${SOXT_PREFIX}/lib 
     177          $ENV{COINDIR}/lib 
     178    NO_DEFAULT_PATH 
     179) 
     180 
     181# try to find SoXt lib (regular paths) 
     182FIND_LIBRARY(INVENTOR_SOXT_LIBRARY 
     183    NAMES soxt1 SoXt 
     184    PATHS ${INVENTOR_LIB_SEARCH_PATH} 
     185) 
     186 
     187# try to find SoXt debug lib (priority paths) 
     188FIND_LIBRARY(INVENTOR_SOXT_LIBRARY_DEBUG 
     189    NAMES soxt1d 
     190    PATHS ${SOXT_PREFIX}/lib 
     191          $ENV{COINDIR}/lib 
     192    NO_DEFAULT_PATH 
     193) 
     194 
     195# try to find SoXt debug lib (regular paths) 
     196FIND_LIBRARY(INVENTOR_SOXT_LIBRARY_DEBUG 
     197    NAMES soxt1d 
     198    PATHS ${INVENTOR_LIB_SEARCH_PATH} 
     199) 
     200 
     201# SoXt debug library defaults to non-debug lib 
     202IF(NOT INVENTOR_SOXT_LIBRARY_DEBUG) 
     203    IF(INVENTOR_SOXT_LIBRARY) 
     204        SET(INVENTOR_SOXT_LIBRARY_DEBUG INVENTOR_SOXT_LIBRARY) 
     205    ENDIF(INVENTOR_SOXT_LIBRARY) 
     206ENDIF(NOT INVENTOR_SOXT_LIBRARY_DEBUG) 
  • 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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/applications/osgarchive/osgarchive.cpp:9769,9810,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10064,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11009,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/examples:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10064,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11009,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10064,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11009,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/examples/osgcluster/broadcaster.cpp:9769,9816-9818,9826-9828,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10064,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11009,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10228,10264,10283,10340,10410,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/include/osg:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10228,10264,10283,10340,10410,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/include/osgAnimation:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10219,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/OpenThreads/pthreads:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10219,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10191,10208,10264,10283,10340,10417,10440,10456-10457,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/OpenThreads/win32:9769,9816-9818,9826-9827,9832,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10191,10208,10264,10283,10340,10417,10440,10456-10457,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osg:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9897,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osg/Drawable.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9897,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9900,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osg/Geometry.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9900,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10154,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10154,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10062,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osg/Image.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10062,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9897,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osg/Node.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9897,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10083-10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osg/PolygonOffset.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10083-10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osg/State.cpp:9769,9798,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgAnimation:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149-10150,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgDB:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149-10150,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9922,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149-10150,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9922,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149-10150,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10054,10057,10076,10079-10080,10084,10088,10128,10149-10150,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10054,10057,10076,10079-10080,10084,10088,10128,10149-10150,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10358,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgManipulator:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10358,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osgPlugins:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
  • 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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/OpenFlight:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10482-10484,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/bsp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10482-10484,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10482-10484,10487,10491,10520,10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/bsp/VBSPReader.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10482-10484,10487,10491,10520,10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         4/OpenSceneGraph/trunk/src/osgPlugins/bvh:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10222,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/curl:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10222,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osgPlugins/dxf:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osgPlugins/dxf/dxfEntity.cpp:9769,9804,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
  • 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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp:9769,9801,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10496,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/jpeg:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10496,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10093,10128,10149,10208,10264,10283,10340,10417,10440,10456,10482-10483,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/mdl:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10093,10128,10149,10208,10264,10283,10340,10417,10440,10456,10482-10483,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10093,10128,10149,10208,10264,10283,10340,10417,10440,10456,10482-10483,10487,10491,10520,10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/mdl/MDLReader.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10093,10128,10149,10208,10264,10283,10340,10417,10440,10456,10482-10483,10487,10491,10520,10539,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osgPlugins/osgAnimation:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-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,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/osgVolume:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-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,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10144,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/pdf:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10144,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10387,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgPlugins/txp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10387,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10321,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgSim:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10321,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10230,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgTerrain:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10230,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10376,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgText/TextBase.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10376,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-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,10128,10149,10208,10264,10283,10340,10417,10440,10456,10480,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         3/OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-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,10128,10149,10208,10264,10283,10340,10417,10440,10456,10480,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp:9769,9816-9818,9822,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10208,10264,10283,10340,10417,10440,10456,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10147,10149,10208,10264,10283,10340,10364-10365,10417,10440,10456,10460,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgViewer:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10147,10149,10208,10264,10283,10340,10364-10365,10417,10440,10456,10460,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10147,10149,10208,10264,10283,10340,10364-10365,10417,10440,10456,10460,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowWin32.cpp:9769,9816-9818,9824,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10147,10149,10208,10264,10283,10340,10364-10365,10417,10440,10456,10460,10487,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-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,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgVolume:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-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,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,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-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10182,10208,10264,10283,10340,10417,10440,10456,10487,10489,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032,11034-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237 
         2/OpenSceneGraph/trunk/src/osgWidget:9769,9816-9818,9826-9827,9837-9843,9847,9850,9854-9857,9860-9861,9865,9869,9879-9880,9885,9895,9906,9932,9959,10010,10012-10014,10040-10041,10057,10076,10079-10080,10084,10088,10128,10149,10182,10208,10264,10283,10340,10417,10440,10456,10487,10489,10491,10520,10622-10623,10625,10671-10672,10697,10722,10753,10758,10761,10788,10805,10818,10853-10855,10858,10887,10891,10914,10923,10932-10933,10938,10941-10942,10945,11019,11032-11035,11056,11111,11123,11127,11131,11159,11173,11175,11180,11194,11203,11237