Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum
Timestamp:
May 24, 2012, 8:49:19 PM (12 years ago)
Author:
decapitb
Message:

tower defense update

Location:
code/branches/presentation2012
Files:
19 edited

  • code/branches/presentation2012

  • code/branches/presentation2012/data

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/datamergedeligible
      /code/branches/environment3/datamergedeligible
      /code/branches/formation/datamergedeligible
      /code/branches/gamecontent/datamergedeligible
      /code/branches/hud/datamergedeligible
      /code/branches/masterserverfix/datamergedeligible
      /code/branches/menue/datamergedeligible
      /code/branches/newlevel2012/datamergedeligible
      /code/branches/output/datamergedeligible
      /code/branches/pickup2012/datamergedeligible
      /code/branches/presentation/datamergedeligible
      /code/branches/presentation2011/datamergedeligible
      /code/branches/shipSelection/datamergedeligible
      /code/branches/sound2012/datamergedeligible
      /code/branches/spacegate/datamergedeligible
      /code/branches/spaceraceTwo/datamergedeligible
      /code/branches/surfaceRace/datamergedeligible
      /code/branches/usability/datamergedeligible
      /code/trunk/datamergedeligible
      /code/branches/ai/data6592-7033
      /code/branches/ai2/data8721-8880
      /code/branches/bigships/data8137-8588
      /code/branches/buildsystem/data1874-2276,​2278-2400
      /code/branches/buildsystem2/data2506-2658
      /code/branches/buildsystem3/data2662-2708
      /code/branches/ceguilua/data1802-1808
      /code/branches/chat/data6527-6797
      /code/branches/chat2/data6836-6910
      /code/branches/console/data5941-6104
      /code/branches/consolecommands2/data6451-7178
      /code/branches/consolecommands3/data7178-7283
      /code/branches/core3/data1572-1739
      /code/branches/core4/data3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data5768-5928,​6009
      /code/branches/data_cleanup/data7537-7686
      /code/branches/doc/data7290-7400
      /code/branches/dockingsystem/data8101-8192
      /code/branches/dynamicmatch/data6584-7030
      /code/branches/fps/data6591-7072
      /code/branches/gameimmersion/data8102-8577
      /code/branches/gamestate/data6430-6572,​6621-6661
      /code/branches/gamestates2/data6594-6745
      /code/branches/gametypes/data2826-3031
      /code/branches/gcc43/data1580
      /code/branches/gui/data1635-1723,​2795-2894
      /code/branches/hudelements/data6584-6941
      /code/branches/hudimprovements/data7920-8672
      /code/branches/ingamemenu/data6000-6023
      /code/branches/input/data1629-1636
      /code/branches/ipv6/data7293-7458
      /code/branches/kicklib/data7940-8096,​8098-8277
      /code/branches/kicklib2/data8282-8350
      /code/branches/lastmanstanding/data7479-7644
      /code/branches/lastmanstanding3/data7903-8175
      /code/branches/libraries/data5612-5692
      /code/branches/libraries2/data5703-5737
      /code/branches/lod/data6586-6911
      /code/branches/lodfinal/data2372-2411
      /code/branches/mac_osx/data7789-8128,​8135
      /code/branches/map/data2801-3086,​3089
      /code/branches/masterserver/data7502-7738
      /code/branches/menu/data5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data2754-2824
      /code/branches/netp2/data2835-2988
      /code/branches/netp3/data2988-3082
      /code/branches/netp6/data3214-3302
      /code/branches/network/data2356
      /code/branches/network2/data6434-6465
      /code/branches/network3/data7196-7344
      /code/branches/network4/data7497-7755
      /code/branches/network5/data7757-7781
      /code/branches/network6/data7823-8315
      /code/branches/network64/data2210-2355
      /code/branches/notifications/data7314-7401
      /code/branches/objecthierarchy/data1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data2171-2479
      /code/branches/ois_update/data7506-7788
      /code/branches/overlay/data2117-2385
      /code/branches/particles/data2829-3085
      /code/branches/particles2/data6050-6106,​6109
      /code/branches/pch/data3113-3194
      /code/branches/physics/data1912-2055,​2107-2439
      /code/branches/physics_merge/data2436-2457
      /code/branches/pickup/data8145-8555
      /code/branches/pickup2/data5942-6405
      /code/branches/pickup3/data6418-6523
      /code/branches/pickup4/data6594-6710
      /code/branches/pickups/data1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data2107-2497,​2915-3071
      /code/branches/png2/data7262-7263
      /code/branches/portals/data8087-8455
      /code/branches/portals2/data8460-8602
      /code/branches/ppspickups1/data6552-6708
      /code/branches/ppspickups2/data6527-6532,​6554-6709
      /code/branches/ppspickups3/data6757-6997
      /code/branches/ppspickups4/data7003-7089
      /code/branches/presentation2/data6106-6416,​7787-7800
      /code/branches/presentation3/data6913-7162
      /code/branches/questsystem/data1894-2088
      /code/branches/questsystem2/data2107-2259
      /code/branches/questsystem5/data2776-2905
      /code/branches/releasetodo/data7614-7647
      /code/branches/resource/data3327-3366
      /code/branches/resource2/data3372-5694
      /code/branches/rocket/data6523-6950
      /code/branches/rocket2/data6953-6970
      /code/branches/script_trigger/data1295-1953,​1955
      /code/branches/skybox2/data6559-6989
      /code/branches/sound/data2829-3010
      /code/branches/sound3/data5941-6102
      /code/branches/spaceboundaries/data8085-8457
      /code/branches/spaceboundaries2/data8460-8613
      /code/branches/spacerace/data8182-8630
      /code/branches/steering/data5949-6091,​8140-8595
      /code/branches/tetris/data8100-8563
      /code/branches/tutoriallevel/data7827-8370
      /code/branches/tutoriallevel2/data8370-8452
      /code/branches/tutoriallevel3/data8453-8636
      /code/branches/unity_build/data8440-8716
      /code/branches/weapon/data1925-2094
      /code/branches/weapon2/data2107-2488
      /code/branches/weapons/data2897-3051,​8143-8591
      /code/branches/weaponsystem/data2742-2890
  • code/branches/presentation2012/data/levels

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levelsmergedeligible
      /code/branches/environment3/data/levelsmergedeligible
      /code/branches/formation/data/levelsmergedeligible
      /code/branches/gamecontent/data/levelsmergedeligible
      /code/branches/hud/data/levelsmergedeligible
      /code/branches/masterserverfix/data/levelsmergedeligible
      /code/branches/menue/data/levelsmergedeligible
      /code/branches/newlevel2012/data/levelsmergedeligible
      /code/branches/output/data/levelsmergedeligible
      /code/branches/pickup2012/data/levelsmergedeligible
      /code/branches/presentation/data/levelsmergedeligible
      /code/branches/presentation2011/data/levelsmergedeligible
      /code/branches/shipSelection/data/levelsmergedeligible
      /code/branches/sound2012/data/levelsmergednon-inheritableeligible
      /code/branches/spacegate/data/levelsmergedeligible
      /code/branches/spaceraceTwo/data/levelsmergedeligible
      /code/branches/surfaceRace/data/levelsmergedeligible
      /code/branches/usability/data/levelsmergedeligible
      /code/trunk/data/levelsmergedeligible
      /code/branches/ai/data/levels6592-7033
      /code/branches/ai2/data/levels8721-8880
      /code/branches/bigships/data/levels8137-8588
      /code/branches/buildsystem/data/levels1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels2506-2658
      /code/branches/buildsystem3/data/levels2662-2708
      /code/branches/ceguilua/data/levels1802-1808
      /code/branches/chat/data/levels6527-6797
      /code/branches/chat2/data/levels6836-6910
      /code/branches/console/data/levels5941-6104
      /code/branches/consolecommands2/data/levels6451-7178
      /code/branches/consolecommands3/data/levels7178-7283
      /code/branches/core3/data/levels1572-1739
      /code/branches/core4/data/levels3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels5768-5928,​6009
      /code/branches/data_cleanup/data/levels7537-7686
      /code/branches/doc/data/levels7290-7400
      /code/branches/dockingsystem/data/levels8101-8192
      /code/branches/dynamicmatch/data/levels6584-7030
      /code/branches/fps/data/levels6591-7072
      /code/branches/gameimmersion/data/levels8102-8577
      /code/branches/gamestate/data/levels6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels6594-6745
      /code/branches/gametypes/data/levels2826-3031
      /code/branches/gcc43/data/levels1580
      /code/branches/gui/data/levels1635-1723,​2795-2894
      /code/branches/hudelements/data/levels6584-6941
      /code/branches/hudimprovements/data/levels7920-8672
      /code/branches/ingamemenu/data/levels6000-6023
      /code/branches/input/data/levels1629-1636
      /code/branches/ipv6/data/levels7293-7458
      /code/branches/kicklib/data/levels7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels8282-8350
      /code/branches/lastmanstanding/data/levels7479-7644
      /code/branches/lastmanstanding3/data/levels7903-8175
      /code/branches/libraries/data/levels5612-5692
      /code/branches/libraries2/data/levels5703-5737
      /code/branches/lod/data/levels6586-6911
      /code/branches/lodfinal/data/levels2372-2411
      /code/branches/mac_osx/data/levels7789-8128,​8135
      /code/branches/map/data/levels2801-3086,​3089
      /code/branches/masterserver/data/levels7502-7738
      /code/branches/menu/data/levels5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels2754-2824
      /code/branches/netp2/data/levels2835-2988
      /code/branches/netp3/data/levels2988-3082
      /code/branches/netp6/data/levels3214-3302
      /code/branches/network/data/levels2356
      /code/branches/network2/data/levels6434-6465
      /code/branches/network3/data/levels7196-7344
      /code/branches/network4/data/levels7497-7755
      /code/branches/network5/data/levels7757-7781
      /code/branches/network6/data/levels7823-8315
      /code/branches/network64/data/levels2210-2355
      /code/branches/notifications/data/levels7314-7401
      /code/branches/objecthierarchy/data/levels1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels2171-2479
      /code/branches/ois_update/data/levels7506-7788
      /code/branches/overlay/data/levels2117-2385
      /code/branches/particles/data/levels2829-3085
      /code/branches/particles2/data/levels6050-6106,​6109
      /code/branches/pch/data/levels3113-3194
      /code/branches/physics/data/levels1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels2436-2457
      /code/branches/pickup/data/levels8145-8555
      /code/branches/pickup2/data/levels5942-6405
      /code/branches/pickup3/data/levels6418-6523
      /code/branches/pickup4/data/levels6594-6710
      /code/branches/pickups/data/levels1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels2107-2497,​2915-3071
      /code/branches/png2/data/levels7262-7263
      /code/branches/portals/data/levels8087-8455
      /code/branches/portals2/data/levels8460-8602
      /code/branches/ppspickups1/data/levels6552-6708
      /code/branches/ppspickups2/data/levels6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels6757-6997
      /code/branches/ppspickups4/data/levels7003-7089
      /code/branches/presentation2/data/levels6106-6416,​7787-7800
      /code/branches/presentation3/data/levels6913-7162
      /code/branches/questsystem/data/levels1894-2088
      /code/branches/questsystem2/data/levels2107-2259
      /code/branches/questsystem5/data/levels2776-2905
      /code/branches/releasetodo/data/levels7614-7647
      /code/branches/resource/data/levels3327-3366
      /code/branches/resource2/data/levels3372-5694
      /code/branches/rocket/data/levels6523-6950
      /code/branches/rocket2/data/levels6953-6970
      /code/branches/script_trigger/data/levels1295-1953,​1955
      /code/branches/skybox2/data/levels6559-6989
      /code/branches/sound/data/levels2829-3010
      /code/branches/sound3/data/levels5941-6102
      /code/branches/spaceboundaries/data/levels8085-8457
      /code/branches/spaceboundaries2/data/levels8460-8613
      /code/branches/spacerace/data/levels8182-8630
      /code/branches/steering/data/levels5949-6091,​8140-8595
      /code/branches/tetris/data/levels8100-8563
      /code/branches/tutoriallevel/data/levels7827-8370
      /code/branches/tutoriallevel2/data/levels8370-8452
      /code/branches/tutoriallevel3/data/levels8453-8636
      /code/branches/unity_build/data/levels8440-8716
      /code/branches/weapon/data/levels1925-2094
      /code/branches/weapon2/data/levels2107-2488
      /code/branches/weapons/data/levels2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels2742-2890
  • code/branches/presentation2012/data/levels/templates

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templatesmergedeligible
      /code/branches/environment3/data/levels/templatesmergedeligible
      /code/branches/formation/data/levels/templatesmergedeligible
      /code/branches/gamecontent/data/levels/templatesmergedeligible
      /code/branches/hud/data/levels/templatesmergedeligible
      /code/branches/masterserverfix/data/levels/templatesmergedeligible
      /code/branches/menue/data/levels/templatesmergedeligible
      /code/branches/newlevel2012/data/levels/templatesmergedeligible
      /code/branches/output/data/levels/templatesmergedeligible
      /code/branches/pickup2012/data/levels/templatesmergedeligible
      /code/branches/presentation/data/levels/templatesmergedeligible
      /code/branches/presentation2011/data/levels/templatesmergedeligible
      /code/branches/shipSelection/data/levels/templatesmergedeligible
      /code/branches/sound2012/data/levels/templatesmergednon-inheritableeligible
      /code/branches/spacegate/data/levels/templatesmergedeligible
      /code/branches/spaceraceTwo/data/levels/templatesmergedeligible
      /code/branches/surfaceRace/data/levels/templatesmergedeligible
      /code/branches/usability/data/levels/templatesmergedeligible
      /code/trunk/data/levels/templatesmergedeligible
      /code/branches/ai/data/levels/templates6592-7033
      /code/branches/ai2/data/levels/templates8721-8880
      /code/branches/bigships/data/levels/templates8137-8588
      /code/branches/buildsystem/data/levels/templates1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates2506-2658
      /code/branches/buildsystem3/data/levels/templates2662-2708
      /code/branches/ceguilua/data/levels/templates1802-1808
      /code/branches/chat/data/levels/templates6527-6797
      /code/branches/chat2/data/levels/templates6836-6910
      /code/branches/console/data/levels/templates5941-6104
      /code/branches/consolecommands2/data/levels/templates6451-7178
      /code/branches/consolecommands3/data/levels/templates7178-7283
      /code/branches/core3/data/levels/templates1572-1739
      /code/branches/core4/data/levels/templates3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates7537-7686
      /code/branches/doc/data/levels/templates7290-7400
      /code/branches/dockingsystem/data/levels/templates8101-8192
      /code/branches/dynamicmatch/data/levels/templates6584-7030
      /code/branches/fps/data/levels/templates6591-7072
      /code/branches/gameimmersion/data/levels/templates8102-8577
      /code/branches/gamestate/data/levels/templates6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates6594-6745
      /code/branches/gametypes/data/levels/templates2826-3031
      /code/branches/gcc43/data/levels/templates1580
      /code/branches/gui/data/levels/templates1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates6584-6941
      /code/branches/hudimprovements/data/levels/templates7920-8672
      /code/branches/ingamemenu/data/levels/templates6000-6023
      /code/branches/input/data/levels/templates1629-1636
      /code/branches/ipv6/data/levels/templates7293-7458
      /code/branches/kicklib/data/levels/templates7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates8282-8350
      /code/branches/lastmanstanding/data/levels/templates7479-7644
      /code/branches/lastmanstanding3/data/levels/templates7903-8175
      /code/branches/libraries/data/levels/templates5612-5692
      /code/branches/libraries2/data/levels/templates5703-5737
      /code/branches/lod/data/levels/templates6586-6911
      /code/branches/lodfinal/data/levels/templates2372-2411
      /code/branches/mac_osx/data/levels/templates7789-8128,​8135
      /code/branches/map/data/levels/templates2801-3086,​3089
      /code/branches/masterserver/data/levels/templates7502-7738
      /code/branches/menu/data/levels/templates5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates2754-2824
      /code/branches/netp2/data/levels/templates2835-2988
      /code/branches/netp3/data/levels/templates2988-3082
      /code/branches/netp6/data/levels/templates3214-3302
      /code/branches/network/data/levels/templates2356
      /code/branches/network2/data/levels/templates6434-6465
      /code/branches/network3/data/levels/templates7196-7344
      /code/branches/network4/data/levels/templates7497-7755
      /code/branches/network5/data/levels/templates7757-7781
      /code/branches/network6/data/levels/templates7823-8315
      /code/branches/network64/data/levels/templates2210-2355
      /code/branches/notifications/data/levels/templates7314-7401
      /code/branches/objecthierarchy/data/levels/templates1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates2171-2479
      /code/branches/ois_update/data/levels/templates7506-7788
      /code/branches/overlay/data/levels/templates2117-2385
      /code/branches/particles/data/levels/templates2829-3085
      /code/branches/particles2/data/levels/templates6050-6106,​6109
      /code/branches/pch/data/levels/templates3113-3194
      /code/branches/physics/data/levels/templates1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates2436-2457
      /code/branches/pickup/data/levels/templates8145-8555
      /code/branches/pickup2/data/levels/templates5942-6405
      /code/branches/pickup3/data/levels/templates6418-6523
      /code/branches/pickup4/data/levels/templates6594-6710
      /code/branches/pickups/data/levels/templates1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates7262-7263
      /code/branches/portals/data/levels/templates8087-8455
      /code/branches/portals2/data/levels/templates8460-8602
      /code/branches/ppspickups1/data/levels/templates6552-6708
      /code/branches/ppspickups2/data/levels/templates6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates6757-6997
      /code/branches/ppspickups4/data/levels/templates7003-7089
      /code/branches/presentation2/data/levels/templates6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates6913-7162
      /code/branches/questsystem/data/levels/templates1894-2088
      /code/branches/questsystem2/data/levels/templates2107-2259
      /code/branches/questsystem5/data/levels/templates2776-2905
      /code/branches/releasetodo/data/levels/templates7614-7647
      /code/branches/resource/data/levels/templates3327-3366
      /code/branches/resource2/data/levels/templates3372-5694
      /code/branches/rocket/data/levels/templates6523-6950
      /code/branches/rocket2/data/levels/templates6953-6970
      /code/branches/script_trigger/data/levels/templates1295-1953,​1955
      /code/branches/skybox2/data/levels/templates6559-6989
      /code/branches/sound/data/levels/templates2829-3010
      /code/branches/sound3/data/levels/templates5941-6102
      /code/branches/spaceboundaries/data/levels/templates8085-8457
      /code/branches/spaceboundaries2/data/levels/templates8460-8613
      /code/branches/spacerace/data/levels/templates8182-8630
      /code/branches/steering/data/levels/templates5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates8100-8563
      /code/branches/tutoriallevel/data/levels/templates7827-8370
      /code/branches/tutoriallevel2/data/levels/templates8370-8452
      /code/branches/tutoriallevel3/data/levels/templates8453-8636
      /code/branches/unity_build/data/levels/templates8440-8716
      /code/branches/weapon/data/levels/templates1925-2094
      /code/branches/weapon2/data/levels/templates2107-2488
      /code/branches/weapons/data/levels/templates2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates2742-2890
  • code/branches/presentation2012/data/levels/templates/FPS.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/environment3/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/formation/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/hud/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/menue/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/output/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/usability/data/levels/templates/FPS.oxtmergedeligible
      /code/trunk/data/levels/templates/FPS.oxtmergedeligible
      /code/branches/ai/data/levels/templates/FPS.oxt6592-7033
      /code/branches/ai2/data/levels/templates/FPS.oxt8721-8880
      /code/branches/bigships/data/levels/templates/FPS.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/FPS.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/FPS.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/FPS.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/FPS.oxt1802-1808
      /code/branches/chat/data/levels/templates/FPS.oxt6527-6797
      /code/branches/chat2/data/levels/templates/FPS.oxt6836-6910
      /code/branches/console/data/levels/templates/FPS.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/FPS.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/FPS.oxt7178-7283
      /code/branches/core3/data/levels/templates/FPS.oxt1572-1739
      /code/branches/core4/data/levels/templates/FPS.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/FPS.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/FPS.oxt7537-7686
      /code/branches/doc/data/levels/templates/FPS.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/FPS.oxt8101-8192
      /code/branches/dynamicmatch/data/levels/templates/FPS.oxt6584-7030
      /code/branches/fps/data/levels/templates/FPS.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/FPS.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/FPS.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/FPS.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/FPS.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/FPS.oxt1580
      /code/branches/gui/data/levels/templates/FPS.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/FPS.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/FPS.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/FPS.oxt6000-6023
      /code/branches/input/data/levels/templates/FPS.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/FPS.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/FPS.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/FPS.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/FPS.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/FPS.oxt7903-8175
      /code/branches/libraries/data/levels/templates/FPS.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/FPS.oxt5703-5737
      /code/branches/lod/data/levels/templates/FPS.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/FPS.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/FPS.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/FPS.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/FPS.oxt7502-7738
      /code/branches/menu/data/levels/templates/FPS.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/FPS.oxt2754-2824
      /code/branches/netp2/data/levels/templates/FPS.oxt2835-2988
      /code/branches/netp3/data/levels/templates/FPS.oxt2988-3082
      /code/branches/netp6/data/levels/templates/FPS.oxt3214-3302
      /code/branches/network/data/levels/templates/FPS.oxt2356
      /code/branches/network2/data/levels/templates/FPS.oxt6434-6465
      /code/branches/network3/data/levels/templates/FPS.oxt7196-7344
      /code/branches/network4/data/levels/templates/FPS.oxt7497-7755
      /code/branches/network5/data/levels/templates/FPS.oxt7757-7781
      /code/branches/network6/data/levels/templates/FPS.oxt7823-8315
      /code/branches/network64/data/levels/templates/FPS.oxt2210-2355
      /code/branches/notifications/data/levels/templates/FPS.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/FPS.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/FPS.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/FPS.oxt7506-7788
      /code/branches/overlay/data/levels/templates/FPS.oxt2117-2385
      /code/branches/particles/data/levels/templates/FPS.oxt2829-3085
      /code/branches/particles2/data/levels/templates/FPS.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/FPS.oxt3113-3194
      /code/branches/physics/data/levels/templates/FPS.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/FPS.oxt2436-2457
      /code/branches/pickup/data/levels/templates/FPS.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/FPS.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/FPS.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/FPS.oxt6594-6710
      /code/branches/pickups/data/levels/templates/FPS.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/FPS.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/FPS.oxt7262-7263
      /code/branches/portals/data/levels/templates/FPS.oxt8087-8455
      /code/branches/portals2/data/levels/templates/FPS.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/FPS.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/FPS.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/FPS.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/FPS.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/FPS.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/FPS.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/FPS.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/FPS.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/FPS.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/FPS.oxt7614-7647
      /code/branches/resource/data/levels/templates/FPS.oxt3327-3366
      /code/branches/resource2/data/levels/templates/FPS.oxt3372-5694
      /code/branches/rocket/data/levels/templates/FPS.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/FPS.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/FPS.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/FPS.oxt6559-6989
      /code/branches/sound/data/levels/templates/FPS.oxt2829-3010
      /code/branches/sound3/data/levels/templates/FPS.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/FPS.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/FPS.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/FPS.oxt8182-8630
      /code/branches/steering/data/levels/templates/FPS.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/FPS.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/FPS.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/FPS.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/FPS.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/FPS.oxt8440-8716
      /code/branches/weapon/data/levels/templates/FPS.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/FPS.oxt2107-2488
      /code/branches/weapons/data/levels/templates/FPS.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/FPS.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/lodInformation.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/environment3/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/formation/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/hud/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/menue/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/output/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/usability/data/levels/templates/lodInformation.oxtmergedeligible
      /code/trunk/data/levels/templates/lodInformation.oxtmergedeligible
      /code/branches/ai/data/levels/templates/lodInformation.oxt6592-7033
      /code/branches/ai2/data/levels/templates/lodInformation.oxt8721-8880
      /code/branches/bigships/data/levels/templates/lodInformation.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/lodInformation.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/lodInformation.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/lodInformation.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/lodInformation.oxt1802-1808
      /code/branches/chat/data/levels/templates/lodInformation.oxt6527-6797
      /code/branches/chat2/data/levels/templates/lodInformation.oxt6836-6910
      /code/branches/console/data/levels/templates/lodInformation.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/lodInformation.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/lodInformation.oxt7178-7283
      /code/branches/core3/data/levels/templates/lodInformation.oxt1572-1739
      /code/branches/core4/data/levels/templates/lodInformation.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/lodInformation.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/lodInformation.oxt7537-7686
      /code/branches/doc/data/levels/templates/lodInformation.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/lodInformation.oxt8101-8192
      /code/branches/dynamicmatch/data/levels/templates/lodInformation.oxt6584-7030
      /code/branches/fps/data/levels/templates/lodInformation.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/lodInformation.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/lodInformation.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/lodInformation.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/lodInformation.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/lodInformation.oxt1580
      /code/branches/gui/data/levels/templates/lodInformation.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/lodInformation.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/lodInformation.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/lodInformation.oxt6000-6023
      /code/branches/input/data/levels/templates/lodInformation.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/lodInformation.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/lodInformation.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/lodInformation.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/lodInformation.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/lodInformation.oxt7903-8175
      /code/branches/libraries/data/levels/templates/lodInformation.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/lodInformation.oxt5703-5737
      /code/branches/lod/data/levels/templates/lodInformation.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/lodInformation.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/lodInformation.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/lodInformation.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/lodInformation.oxt7502-7738
      /code/branches/menu/data/levels/templates/lodInformation.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/lodInformation.oxt2754-2824
      /code/branches/netp2/data/levels/templates/lodInformation.oxt2835-2988
      /code/branches/netp3/data/levels/templates/lodInformation.oxt2988-3082
      /code/branches/netp6/data/levels/templates/lodInformation.oxt3214-3302
      /code/branches/network/data/levels/templates/lodInformation.oxt2356
      /code/branches/network2/data/levels/templates/lodInformation.oxt6434-6465
      /code/branches/network3/data/levels/templates/lodInformation.oxt7196-7344
      /code/branches/network4/data/levels/templates/lodInformation.oxt7497-7755
      /code/branches/network5/data/levels/templates/lodInformation.oxt7757-7781
      /code/branches/network6/data/levels/templates/lodInformation.oxt7823-8315
      /code/branches/network64/data/levels/templates/lodInformation.oxt2210-2355
      /code/branches/notifications/data/levels/templates/lodInformation.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/lodInformation.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/lodInformation.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/lodInformation.oxt7506-7788
      /code/branches/overlay/data/levels/templates/lodInformation.oxt2117-2385
      /code/branches/particles/data/levels/templates/lodInformation.oxt2829-3085
      /code/branches/particles2/data/levels/templates/lodInformation.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/lodInformation.oxt3113-3194
      /code/branches/physics/data/levels/templates/lodInformation.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/lodInformation.oxt2436-2457
      /code/branches/pickup/data/levels/templates/lodInformation.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/lodInformation.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/lodInformation.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/lodInformation.oxt6594-6710
      /code/branches/pickups/data/levels/templates/lodInformation.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/lodInformation.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/lodInformation.oxt7262-7263
      /code/branches/portals/data/levels/templates/lodInformation.oxt8087-8455
      /code/branches/portals2/data/levels/templates/lodInformation.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/lodInformation.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/lodInformation.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/lodInformation.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/lodInformation.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/lodInformation.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/lodInformation.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/lodInformation.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/lodInformation.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/lodInformation.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/lodInformation.oxt7614-7647
      /code/branches/resource/data/levels/templates/lodInformation.oxt3327-3366
      /code/branches/resource2/data/levels/templates/lodInformation.oxt3372-5694
      /code/branches/rocket/data/levels/templates/lodInformation.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/lodInformation.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/lodInformation.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/lodInformation.oxt6559-6989
      /code/branches/sound/data/levels/templates/lodInformation.oxt2829-3010
      /code/branches/sound3/data/levels/templates/lodInformation.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/lodInformation.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/lodInformation.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/lodInformation.oxt8182-8630
      /code/branches/steering/data/levels/templates/lodInformation.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/lodInformation.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/lodInformation.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/lodInformation.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/lodInformation.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/lodInformation.oxt8440-8716
      /code/branches/weapon/data/levels/templates/lodInformation.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/lodInformation.oxt2107-2488
      /code/branches/weapons/data/levels/templates/lodInformation.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/lodInformation.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/pickupRepresentationTemplates.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/environment3/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/formation/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/hud/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/menue/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/output/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/usability/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/trunk/data/levels/templates/pickupRepresentationTemplates.oxtmergedeligible
      /code/branches/ai/data/levels/templates/pickupRepresentationTemplates.oxt6592-7033
      /code/branches/ai2/data/levels/templates/pickupRepresentationTemplates.oxt8721-8880
      /code/branches/bigships/data/levels/templates/pickupRepresentationTemplates.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/pickupRepresentationTemplates.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/pickupRepresentationTemplates.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/pickupRepresentationTemplates.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/pickupRepresentationTemplates.oxt1802-1808
      /code/branches/chat/data/levels/templates/pickupRepresentationTemplates.oxt6527-6797
      /code/branches/chat2/data/levels/templates/pickupRepresentationTemplates.oxt6836-6910
      /code/branches/console/data/levels/templates/pickupRepresentationTemplates.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/pickupRepresentationTemplates.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/pickupRepresentationTemplates.oxt7178-7283
      /code/branches/core3/data/levels/templates/pickupRepresentationTemplates.oxt1572-1739
      /code/branches/core4/data/levels/templates/pickupRepresentationTemplates.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/pickupRepresentationTemplates.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/pickupRepresentationTemplates.oxt7537-7686
      /code/branches/doc/data/levels/templates/pickupRepresentationTemplates.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/pickupRepresentationTemplates.oxt8101-8192
      /code/branches/dynamicmatch/data/levels/templates/pickupRepresentationTemplates.oxt6584-7030
      /code/branches/fps/data/levels/templates/pickupRepresentationTemplates.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/pickupRepresentationTemplates.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/pickupRepresentationTemplates.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/pickupRepresentationTemplates.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/pickupRepresentationTemplates.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/pickupRepresentationTemplates.oxt1580
      /code/branches/gui/data/levels/templates/pickupRepresentationTemplates.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/pickupRepresentationTemplates.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/pickupRepresentationTemplates.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/pickupRepresentationTemplates.oxt6000-6023
      /code/branches/input/data/levels/templates/pickupRepresentationTemplates.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/pickupRepresentationTemplates.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/pickupRepresentationTemplates.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/pickupRepresentationTemplates.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/pickupRepresentationTemplates.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/pickupRepresentationTemplates.oxt7903-8175
      /code/branches/libraries/data/levels/templates/pickupRepresentationTemplates.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/pickupRepresentationTemplates.oxt5703-5737
      /code/branches/lod/data/levels/templates/pickupRepresentationTemplates.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/pickupRepresentationTemplates.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/pickupRepresentationTemplates.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/pickupRepresentationTemplates.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/pickupRepresentationTemplates.oxt7502-7738
      /code/branches/menu/data/levels/templates/pickupRepresentationTemplates.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/pickupRepresentationTemplates.oxt2754-2824
      /code/branches/netp2/data/levels/templates/pickupRepresentationTemplates.oxt2835-2988
      /code/branches/netp3/data/levels/templates/pickupRepresentationTemplates.oxt2988-3082
      /code/branches/netp6/data/levels/templates/pickupRepresentationTemplates.oxt3214-3302
      /code/branches/network/data/levels/templates/pickupRepresentationTemplates.oxt2356
      /code/branches/network2/data/levels/templates/pickupRepresentationTemplates.oxt6434-6465
      /code/branches/network3/data/levels/templates/pickupRepresentationTemplates.oxt7196-7344
      /code/branches/network4/data/levels/templates/pickupRepresentationTemplates.oxt7497-7755
      /code/branches/network5/data/levels/templates/pickupRepresentationTemplates.oxt7757-7781
      /code/branches/network6/data/levels/templates/pickupRepresentationTemplates.oxt7823-8315
      /code/branches/network64/data/levels/templates/pickupRepresentationTemplates.oxt2210-2355
      /code/branches/notifications/data/levels/templates/pickupRepresentationTemplates.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/pickupRepresentationTemplates.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/pickupRepresentationTemplates.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/pickupRepresentationTemplates.oxt7506-7788
      /code/branches/overlay/data/levels/templates/pickupRepresentationTemplates.oxt2117-2385
      /code/branches/particles/data/levels/templates/pickupRepresentationTemplates.oxt2829-3085
      /code/branches/particles2/data/levels/templates/pickupRepresentationTemplates.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/pickupRepresentationTemplates.oxt3113-3194
      /code/branches/physics/data/levels/templates/pickupRepresentationTemplates.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/pickupRepresentationTemplates.oxt2436-2457
      /code/branches/pickup/data/levels/templates/pickupRepresentationTemplates.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/pickupRepresentationTemplates.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/pickupRepresentationTemplates.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/pickupRepresentationTemplates.oxt6594-6710
      /code/branches/pickups/data/levels/templates/pickupRepresentationTemplates.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/pickupRepresentationTemplates.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/pickupRepresentationTemplates.oxt7262-7263
      /code/branches/portals/data/levels/templates/pickupRepresentationTemplates.oxt8087-8455
      /code/branches/portals2/data/levels/templates/pickupRepresentationTemplates.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/pickupRepresentationTemplates.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/pickupRepresentationTemplates.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/pickupRepresentationTemplates.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/pickupRepresentationTemplates.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/pickupRepresentationTemplates.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/pickupRepresentationTemplates.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/pickupRepresentationTemplates.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/pickupRepresentationTemplates.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/pickupRepresentationTemplates.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/pickupRepresentationTemplates.oxt7614-7647
      /code/branches/resource/data/levels/templates/pickupRepresentationTemplates.oxt3327-3366
      /code/branches/resource2/data/levels/templates/pickupRepresentationTemplates.oxt3372-5694
      /code/branches/rocket/data/levels/templates/pickupRepresentationTemplates.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/pickupRepresentationTemplates.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/pickupRepresentationTemplates.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/pickupRepresentationTemplates.oxt6559-6989
      /code/branches/sound/data/levels/templates/pickupRepresentationTemplates.oxt2829-3010
      /code/branches/sound3/data/levels/templates/pickupRepresentationTemplates.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/pickupRepresentationTemplates.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/pickupRepresentationTemplates.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/pickupRepresentationTemplates.oxt8182-8630
      /code/branches/steering/data/levels/templates/pickupRepresentationTemplates.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/pickupRepresentationTemplates.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/pickupRepresentationTemplates.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/pickupRepresentationTemplates.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/pickupRepresentationTemplates.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/pickupRepresentationTemplates.oxt8440-8716
      /code/branches/weapon/data/levels/templates/pickupRepresentationTemplates.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/pickupRepresentationTemplates.oxt2107-2488
      /code/branches/weapons/data/levels/templates/pickupRepresentationTemplates.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/pickupRepresentationTemplates.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/spaceshipAssff.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/environment3/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/formation/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/hud/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/menue/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/output/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/usability/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/trunk/data/levels/templates/spaceshipAssff.oxtmergedeligible
      /code/branches/ai/data/levels/templates/spaceshipAssff.oxt6592-7033
      /code/branches/ai2/data/levels/templates/spaceshipAssff.oxt8721-8880
      /code/branches/bigships/data/levels/templates/spaceshipAssff.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/spaceshipAssff.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/spaceshipAssff.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/spaceshipAssff.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/spaceshipAssff.oxt1802-1808
      /code/branches/chat/data/levels/templates/spaceshipAssff.oxt6527-6797
      /code/branches/chat2/data/levels/templates/spaceshipAssff.oxt6836-6910
      /code/branches/console/data/levels/templates/spaceshipAssff.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/spaceshipAssff.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/spaceshipAssff.oxt7178-7283
      /code/branches/core3/data/levels/templates/spaceshipAssff.oxt1572-1739
      /code/branches/core4/data/levels/templates/spaceshipAssff.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/spaceshipAssff.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/spaceshipAssff.oxt7537-7686
      /code/branches/doc/data/levels/templates/spaceshipAssff.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/spaceshipAssff.oxt8101-8192
      /code/branches/dynamicmatch/data/levels/templates/spaceshipAssff.oxt6584-7030
      /code/branches/fps/data/levels/templates/spaceshipAssff.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/spaceshipAssff.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/spaceshipAssff.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/spaceshipAssff.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/spaceshipAssff.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/spaceshipAssff.oxt1580
      /code/branches/gui/data/levels/templates/spaceshipAssff.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/spaceshipAssff.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/spaceshipAssff.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/spaceshipAssff.oxt6000-6023
      /code/branches/input/data/levels/templates/spaceshipAssff.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/spaceshipAssff.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/spaceshipAssff.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/spaceshipAssff.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/spaceshipAssff.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/spaceshipAssff.oxt7903-8175
      /code/branches/libraries/data/levels/templates/spaceshipAssff.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/spaceshipAssff.oxt5703-5737
      /code/branches/lod/data/levels/templates/spaceshipAssff.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/spaceshipAssff.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/spaceshipAssff.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/spaceshipAssff.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/spaceshipAssff.oxt7502-7738
      /code/branches/menu/data/levels/templates/spaceshipAssff.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/spaceshipAssff.oxt2754-2824
      /code/branches/netp2/data/levels/templates/spaceshipAssff.oxt2835-2988
      /code/branches/netp3/data/levels/templates/spaceshipAssff.oxt2988-3082
      /code/branches/netp6/data/levels/templates/spaceshipAssff.oxt3214-3302
      /code/branches/network/data/levels/templates/spaceshipAssff.oxt2356
      /code/branches/network2/data/levels/templates/spaceshipAssff.oxt6434-6465
      /code/branches/network3/data/levels/templates/spaceshipAssff.oxt7196-7344
      /code/branches/network4/data/levels/templates/spaceshipAssff.oxt7497-7755
      /code/branches/network5/data/levels/templates/spaceshipAssff.oxt7757-7781
      /code/branches/network6/data/levels/templates/spaceshipAssff.oxt7823-8315
      /code/branches/network64/data/levels/templates/spaceshipAssff.oxt2210-2355
      /code/branches/notifications/data/levels/templates/spaceshipAssff.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/spaceshipAssff.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/spaceshipAssff.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/spaceshipAssff.oxt7506-7788
      /code/branches/overlay/data/levels/templates/spaceshipAssff.oxt2117-2385
      /code/branches/particles/data/levels/templates/spaceshipAssff.oxt2829-3085
      /code/branches/particles2/data/levels/templates/spaceshipAssff.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/spaceshipAssff.oxt3113-3194
      /code/branches/physics/data/levels/templates/spaceshipAssff.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/spaceshipAssff.oxt2436-2457
      /code/branches/pickup/data/levels/templates/spaceshipAssff.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/spaceshipAssff.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/spaceshipAssff.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/spaceshipAssff.oxt6594-6710
      /code/branches/pickups/data/levels/templates/spaceshipAssff.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/spaceshipAssff.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/spaceshipAssff.oxt7262-7263
      /code/branches/portals/data/levels/templates/spaceshipAssff.oxt8087-8455
      /code/branches/portals2/data/levels/templates/spaceshipAssff.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/spaceshipAssff.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/spaceshipAssff.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/spaceshipAssff.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/spaceshipAssff.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/spaceshipAssff.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/spaceshipAssff.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/spaceshipAssff.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/spaceshipAssff.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/spaceshipAssff.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/spaceshipAssff.oxt7614-7647
      /code/branches/resource/data/levels/templates/spaceshipAssff.oxt3327-3366
      /code/branches/resource2/data/levels/templates/spaceshipAssff.oxt3372-5694
      /code/branches/rocket/data/levels/templates/spaceshipAssff.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/spaceshipAssff.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/spaceshipAssff.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/spaceshipAssff.oxt6559-6989
      /code/branches/sound/data/levels/templates/spaceshipAssff.oxt2829-3010
      /code/branches/sound3/data/levels/templates/spaceshipAssff.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/spaceshipAssff.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/spaceshipAssff.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/spaceshipAssff.oxt8182-8630
      /code/branches/steering/data/levels/templates/spaceshipAssff.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/spaceshipAssff.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/spaceshipAssff.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/spaceshipAssff.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/spaceshipAssff.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/spaceshipAssff.oxt8440-8716
      /code/branches/weapon/data/levels/templates/spaceshipAssff.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/spaceshipAssff.oxt2107-2488
      /code/branches/weapons/data/levels/templates/spaceshipAssff.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/spaceshipAssff.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/spaceshipAssff2.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/environment3/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/formation/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/hud/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/menue/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/output/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/trunk/data/levels/templates/spaceshipAssff2.oxtmergedeligible
      /code/branches/ai/data/levels/templates/spaceshipAssff2.oxt6592-7033
      /code/branches/ai2/data/levels/templates/spaceshipAssff2.oxt8721-8880
      /code/branches/bigships/data/levels/templates/spaceshipAssff2.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/spaceshipAssff2.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/spaceshipAssff2.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/spaceshipAssff2.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/spaceshipAssff2.oxt1802-1808
      /code/branches/chat/data/levels/templates/spaceshipAssff2.oxt6527-6797
      /code/branches/chat2/data/levels/templates/spaceshipAssff2.oxt6836-6910
      /code/branches/console/data/levels/templates/spaceshipAssff2.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/spaceshipAssff2.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/spaceshipAssff2.oxt7178-7283
      /code/branches/core3/data/levels/templates/spaceshipAssff2.oxt1572-1739
      /code/branches/core4/data/levels/templates/spaceshipAssff2.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/spaceshipAssff2.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/spaceshipAssff2.oxt7537-7686
      /code/branches/doc/data/levels/templates/spaceshipAssff2.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/spaceshipAssff2.oxt8101-8192
      /code/branches/dockingsystem2/data/levels/templates/spaceshipAssff2.oxt8196-8560
      /code/branches/dynamicmatch/data/levels/templates/spaceshipAssff2.oxt6584-7030
      /code/branches/fps/data/levels/templates/spaceshipAssff2.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/spaceshipAssff2.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/spaceshipAssff2.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/spaceshipAssff2.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/spaceshipAssff2.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/spaceshipAssff2.oxt1580
      /code/branches/gui/data/levels/templates/spaceshipAssff2.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/spaceshipAssff2.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/spaceshipAssff2.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/spaceshipAssff2.oxt6000-6023
      /code/branches/input/data/levels/templates/spaceshipAssff2.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/spaceshipAssff2.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/spaceshipAssff2.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/spaceshipAssff2.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/spaceshipAssff2.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/spaceshipAssff2.oxt7903-8175
      /code/branches/libraries/data/levels/templates/spaceshipAssff2.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/spaceshipAssff2.oxt5703-5737
      /code/branches/lod/data/levels/templates/spaceshipAssff2.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/spaceshipAssff2.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/spaceshipAssff2.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/spaceshipAssff2.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/spaceshipAssff2.oxt7502-7738
      /code/branches/menu/data/levels/templates/spaceshipAssff2.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/spaceshipAssff2.oxt2754-2824
      /code/branches/netp2/data/levels/templates/spaceshipAssff2.oxt2835-2988
      /code/branches/netp3/data/levels/templates/spaceshipAssff2.oxt2988-3082
      /code/branches/netp6/data/levels/templates/spaceshipAssff2.oxt3214-3302
      /code/branches/network/data/levels/templates/spaceshipAssff2.oxt2356
      /code/branches/network2/data/levels/templates/spaceshipAssff2.oxt6434-6465
      /code/branches/network3/data/levels/templates/spaceshipAssff2.oxt7196-7344
      /code/branches/network4/data/levels/templates/spaceshipAssff2.oxt7497-7755
      /code/branches/network5/data/levels/templates/spaceshipAssff2.oxt7757-7781
      /code/branches/network6/data/levels/templates/spaceshipAssff2.oxt7823-8315
      /code/branches/network64/data/levels/templates/spaceshipAssff2.oxt2210-2355
      /code/branches/notifications/data/levels/templates/spaceshipAssff2.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/spaceshipAssff2.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/spaceshipAssff2.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/spaceshipAssff2.oxt7506-7788
      /code/branches/overlay/data/levels/templates/spaceshipAssff2.oxt2117-2385
      /code/branches/particles/data/levels/templates/spaceshipAssff2.oxt2829-3085
      /code/branches/particles2/data/levels/templates/spaceshipAssff2.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/spaceshipAssff2.oxt3113-3194
      /code/branches/physics/data/levels/templates/spaceshipAssff2.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/spaceshipAssff2.oxt2436-2457
      /code/branches/pickup/data/levels/templates/spaceshipAssff2.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/spaceshipAssff2.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/spaceshipAssff2.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/spaceshipAssff2.oxt6594-6710
      /code/branches/pickups/data/levels/templates/spaceshipAssff2.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/spaceshipAssff2.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/spaceshipAssff2.oxt7262-7263
      /code/branches/portals/data/levels/templates/spaceshipAssff2.oxt8087-8455
      /code/branches/portals2/data/levels/templates/spaceshipAssff2.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/spaceshipAssff2.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/spaceshipAssff2.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/spaceshipAssff2.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/spaceshipAssff2.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/spaceshipAssff2.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/spaceshipAssff2.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/spaceshipAssff2.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/spaceshipAssff2.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/spaceshipAssff2.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/spaceshipAssff2.oxt7614-7647
      /code/branches/resource/data/levels/templates/spaceshipAssff2.oxt3327-3366
      /code/branches/resource2/data/levels/templates/spaceshipAssff2.oxt3372-5694
      /code/branches/rocket/data/levels/templates/spaceshipAssff2.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/spaceshipAssff2.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/spaceshipAssff2.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/spaceshipAssff2.oxt6559-6989
      /code/branches/sound/data/levels/templates/spaceshipAssff2.oxt2829-3010
      /code/branches/sound3/data/levels/templates/spaceshipAssff2.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/spaceshipAssff2.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/spaceshipAssff2.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/spaceshipAssff2.oxt8182-8630
      /code/branches/steering/data/levels/templates/spaceshipAssff2.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/spaceshipAssff2.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/spaceshipAssff2.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/spaceshipAssff2.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/spaceshipAssff2.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/spaceshipAssff2.oxt8440-8716
      /code/branches/usability/data/levels/templates/spaceshipAssff2.oxt7915-8078
      /code/branches/weapon/data/levels/templates/spaceshipAssff2.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/spaceshipAssff2.oxt2107-2488
      /code/branches/weapons/data/levels/templates/spaceshipAssff2.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/spaceshipAssff2.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/spaceshipGhost.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/environment3/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/formation/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/hud/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/menue/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/output/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/usability/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/trunk/data/levels/templates/spaceshipGhost.oxtmergedeligible
      /code/branches/ai/data/levels/templates/spaceshipGhost.oxt6592-7033
      /code/branches/ai2/data/levels/templates/spaceshipGhost.oxt8721-8880
      /code/branches/bigships/data/levels/templates/spaceshipGhost.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/spaceshipGhost.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/spaceshipGhost.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/spaceshipGhost.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/spaceshipGhost.oxt1802-1808
      /code/branches/chat/data/levels/templates/spaceshipGhost.oxt6527-6797
      /code/branches/chat2/data/levels/templates/spaceshipGhost.oxt6836-6910
      /code/branches/console/data/levels/templates/spaceshipGhost.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/spaceshipGhost.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/spaceshipGhost.oxt7178-7283
      /code/branches/core3/data/levels/templates/spaceshipGhost.oxt1572-1739
      /code/branches/core4/data/levels/templates/spaceshipGhost.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/spaceshipGhost.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/spaceshipGhost.oxt7537-7686
      /code/branches/doc/data/levels/templates/spaceshipGhost.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/spaceshipGhost.oxt8101-8192
      /code/branches/dynamicmatch/data/levels/templates/spaceshipGhost.oxt6584-7030
      /code/branches/fps/data/levels/templates/spaceshipGhost.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/spaceshipGhost.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/spaceshipGhost.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/spaceshipGhost.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/spaceshipGhost.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/spaceshipGhost.oxt1580
      /code/branches/gui/data/levels/templates/spaceshipGhost.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/spaceshipGhost.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/spaceshipGhost.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/spaceshipGhost.oxt6000-6023
      /code/branches/input/data/levels/templates/spaceshipGhost.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/spaceshipGhost.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/spaceshipGhost.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/spaceshipGhost.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/spaceshipGhost.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/spaceshipGhost.oxt7903-8175
      /code/branches/libraries/data/levels/templates/spaceshipGhost.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/spaceshipGhost.oxt5703-5737
      /code/branches/lod/data/levels/templates/spaceshipGhost.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/spaceshipGhost.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/spaceshipGhost.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/spaceshipGhost.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/spaceshipGhost.oxt7502-7738
      /code/branches/menu/data/levels/templates/spaceshipGhost.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/spaceshipGhost.oxt2754-2824
      /code/branches/netp2/data/levels/templates/spaceshipGhost.oxt2835-2988
      /code/branches/netp3/data/levels/templates/spaceshipGhost.oxt2988-3082
      /code/branches/netp6/data/levels/templates/spaceshipGhost.oxt3214-3302
      /code/branches/network/data/levels/templates/spaceshipGhost.oxt2356
      /code/branches/network2/data/levels/templates/spaceshipGhost.oxt6434-6465
      /code/branches/network3/data/levels/templates/spaceshipGhost.oxt7196-7344
      /code/branches/network4/data/levels/templates/spaceshipGhost.oxt7497-7755
      /code/branches/network5/data/levels/templates/spaceshipGhost.oxt7757-7781
      /code/branches/network6/data/levels/templates/spaceshipGhost.oxt7823-8315
      /code/branches/network64/data/levels/templates/spaceshipGhost.oxt2210-2355
      /code/branches/notifications/data/levels/templates/spaceshipGhost.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/spaceshipGhost.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/spaceshipGhost.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/spaceshipGhost.oxt7506-7788
      /code/branches/overlay/data/levels/templates/spaceshipGhost.oxt2117-2385
      /code/branches/particles/data/levels/templates/spaceshipGhost.oxt2829-3085
      /code/branches/particles2/data/levels/templates/spaceshipGhost.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/spaceshipGhost.oxt3113-3194
      /code/branches/physics/data/levels/templates/spaceshipGhost.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/spaceshipGhost.oxt2436-2457
      /code/branches/pickup/data/levels/templates/spaceshipGhost.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/spaceshipGhost.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/spaceshipGhost.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/spaceshipGhost.oxt6594-6710
      /code/branches/pickups/data/levels/templates/spaceshipGhost.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/spaceshipGhost.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/spaceshipGhost.oxt7262-7263
      /code/branches/portals/data/levels/templates/spaceshipGhost.oxt8087-8455
      /code/branches/portals2/data/levels/templates/spaceshipGhost.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/spaceshipGhost.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/spaceshipGhost.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/spaceshipGhost.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/spaceshipGhost.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/spaceshipGhost.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/spaceshipGhost.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/spaceshipGhost.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/spaceshipGhost.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/spaceshipGhost.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/spaceshipGhost.oxt7614-7647
      /code/branches/resource/data/levels/templates/spaceshipGhost.oxt3327-3366
      /code/branches/resource2/data/levels/templates/spaceshipGhost.oxt3372-5694
      /code/branches/rocket/data/levels/templates/spaceshipGhost.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/spaceshipGhost.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/spaceshipGhost.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/spaceshipGhost.oxt6559-6989
      /code/branches/sound/data/levels/templates/spaceshipGhost.oxt2829-3010
      /code/branches/sound3/data/levels/templates/spaceshipGhost.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/spaceshipGhost.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/spaceshipGhost.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/spaceshipGhost.oxt8182-8630
      /code/branches/steering/data/levels/templates/spaceshipGhost.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/spaceshipGhost.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/spaceshipGhost.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/spaceshipGhost.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/spaceshipGhost.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/spaceshipGhost.oxt8440-8716
      /code/branches/weapon/data/levels/templates/spaceshipGhost.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/spaceshipGhost.oxt2107-2488
      /code/branches/weapons/data/levels/templates/spaceshipGhost.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/spaceshipGhost.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/spaceshipH2.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/environment3/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/formation/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/hud/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/menue/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/output/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/usability/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/trunk/data/levels/templates/spaceshipH2.oxtmergedeligible
      /code/branches/ai/data/levels/templates/spaceshipH2.oxt6592-7033
      /code/branches/ai2/data/levels/templates/spaceshipH2.oxt8721-8880
      /code/branches/bigships/data/levels/templates/spaceshipH2.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/spaceshipH2.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/spaceshipH2.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/spaceshipH2.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/spaceshipH2.oxt1802-1808
      /code/branches/chat/data/levels/templates/spaceshipH2.oxt6527-6797
      /code/branches/chat2/data/levels/templates/spaceshipH2.oxt6836-6910
      /code/branches/console/data/levels/templates/spaceshipH2.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/spaceshipH2.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/spaceshipH2.oxt7178-7283
      /code/branches/core3/data/levels/templates/spaceshipH2.oxt1572-1739
      /code/branches/core4/data/levels/templates/spaceshipH2.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/spaceshipH2.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/spaceshipH2.oxt7537-7686
      /code/branches/doc/data/levels/templates/spaceshipH2.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/spaceshipH2.oxt8101-8192
      /code/branches/dynamicmatch/data/levels/templates/spaceshipH2.oxt6584-7030
      /code/branches/fps/data/levels/templates/spaceshipH2.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/spaceshipH2.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/spaceshipH2.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/spaceshipH2.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/spaceshipH2.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/spaceshipH2.oxt1580
      /code/branches/gui/data/levels/templates/spaceshipH2.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/spaceshipH2.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/spaceshipH2.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/spaceshipH2.oxt6000-6023
      /code/branches/input/data/levels/templates/spaceshipH2.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/spaceshipH2.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/spaceshipH2.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/spaceshipH2.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/spaceshipH2.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/spaceshipH2.oxt7903-8175
      /code/branches/libraries/data/levels/templates/spaceshipH2.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/spaceshipH2.oxt5703-5737
      /code/branches/lod/data/levels/templates/spaceshipH2.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/spaceshipH2.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/spaceshipH2.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/spaceshipH2.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/spaceshipH2.oxt7502-7738
      /code/branches/menu/data/levels/templates/spaceshipH2.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/spaceshipH2.oxt2754-2824
      /code/branches/netp2/data/levels/templates/spaceshipH2.oxt2835-2988
      /code/branches/netp3/data/levels/templates/spaceshipH2.oxt2988-3082
      /code/branches/netp6/data/levels/templates/spaceshipH2.oxt3214-3302
      /code/branches/network/data/levels/templates/spaceshipH2.oxt2356
      /code/branches/network2/data/levels/templates/spaceshipH2.oxt6434-6465
      /code/branches/network3/data/levels/templates/spaceshipH2.oxt7196-7344
      /code/branches/network4/data/levels/templates/spaceshipH2.oxt7497-7755
      /code/branches/network5/data/levels/templates/spaceshipH2.oxt7757-7781
      /code/branches/network6/data/levels/templates/spaceshipH2.oxt7823-8315
      /code/branches/network64/data/levels/templates/spaceshipH2.oxt2210-2355
      /code/branches/notifications/data/levels/templates/spaceshipH2.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/spaceshipH2.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/spaceshipH2.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/spaceshipH2.oxt7506-7788
      /code/branches/overlay/data/levels/templates/spaceshipH2.oxt2117-2385
      /code/branches/particles/data/levels/templates/spaceshipH2.oxt2829-3085
      /code/branches/particles2/data/levels/templates/spaceshipH2.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/spaceshipH2.oxt3113-3194
      /code/branches/physics/data/levels/templates/spaceshipH2.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/spaceshipH2.oxt2436-2457
      /code/branches/pickup/data/levels/templates/spaceshipH2.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/spaceshipH2.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/spaceshipH2.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/spaceshipH2.oxt6594-6710
      /code/branches/pickups/data/levels/templates/spaceshipH2.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/spaceshipH2.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/spaceshipH2.oxt7262-7263
      /code/branches/portals/data/levels/templates/spaceshipH2.oxt8087-8455
      /code/branches/portals2/data/levels/templates/spaceshipH2.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/spaceshipH2.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/spaceshipH2.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/spaceshipH2.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/spaceshipH2.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/spaceshipH2.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/spaceshipH2.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/spaceshipH2.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/spaceshipH2.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/spaceshipH2.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/spaceshipH2.oxt7614-7647
      /code/branches/resource/data/levels/templates/spaceshipH2.oxt3327-3366
      /code/branches/resource2/data/levels/templates/spaceshipH2.oxt3372-5694
      /code/branches/rocket/data/levels/templates/spaceshipH2.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/spaceshipH2.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/spaceshipH2.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/spaceshipH2.oxt6559-6989
      /code/branches/sound/data/levels/templates/spaceshipH2.oxt2829-3010
      /code/branches/sound3/data/levels/templates/spaceshipH2.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/spaceshipH2.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/spaceshipH2.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/spaceshipH2.oxt8182-8630
      /code/branches/steering/data/levels/templates/spaceshipH2.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/spaceshipH2.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/spaceshipH2.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/spaceshipH2.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/spaceshipH2.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/spaceshipH2.oxt8440-8716
      /code/branches/weapon/data/levels/templates/spaceshipH2.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/spaceshipH2.oxt2107-2488
      /code/branches/weapons/data/levels/templates/spaceshipH2.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/spaceshipH2.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/spaceshipHXY.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/environment3/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/formation/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/hud/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/menue/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/output/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/usability/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/trunk/data/levels/templates/spaceshipHXY.oxtmergedeligible
      /code/branches/ai/data/levels/templates/spaceshipHXY.oxt6592-7033
      /code/branches/ai2/data/levels/templates/spaceshipHXY.oxt8721-8880
      /code/branches/bigships/data/levels/templates/spaceshipHXY.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/spaceshipHXY.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/spaceshipHXY.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/spaceshipHXY.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/spaceshipHXY.oxt1802-1808
      /code/branches/chat/data/levels/templates/spaceshipHXY.oxt6527-6797
      /code/branches/chat2/data/levels/templates/spaceshipHXY.oxt6836-6910
      /code/branches/console/data/levels/templates/spaceshipHXY.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/spaceshipHXY.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/spaceshipHXY.oxt7178-7283
      /code/branches/core3/data/levels/templates/spaceshipHXY.oxt1572-1739
      /code/branches/core4/data/levels/templates/spaceshipHXY.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/spaceshipHXY.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/spaceshipHXY.oxt7537-7686
      /code/branches/doc/data/levels/templates/spaceshipHXY.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/spaceshipHXY.oxt8101-8192
      /code/branches/dynamicmatch/data/levels/templates/spaceshipHXY.oxt6584-7030
      /code/branches/fps/data/levels/templates/spaceshipHXY.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/spaceshipHXY.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/spaceshipHXY.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/spaceshipHXY.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/spaceshipHXY.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/spaceshipHXY.oxt1580
      /code/branches/gui/data/levels/templates/spaceshipHXY.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/spaceshipHXY.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/spaceshipHXY.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/spaceshipHXY.oxt6000-6023
      /code/branches/input/data/levels/templates/spaceshipHXY.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/spaceshipHXY.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/spaceshipHXY.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/spaceshipHXY.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/spaceshipHXY.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/spaceshipHXY.oxt7903-8175
      /code/branches/libraries/data/levels/templates/spaceshipHXY.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/spaceshipHXY.oxt5703-5737
      /code/branches/lod/data/levels/templates/spaceshipHXY.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/spaceshipHXY.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/spaceshipHXY.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/spaceshipHXY.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/spaceshipHXY.oxt7502-7738
      /code/branches/menu/data/levels/templates/spaceshipHXY.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/spaceshipHXY.oxt2754-2824
      /code/branches/netp2/data/levels/templates/spaceshipHXY.oxt2835-2988
      /code/branches/netp3/data/levels/templates/spaceshipHXY.oxt2988-3082
      /code/branches/netp6/data/levels/templates/spaceshipHXY.oxt3214-3302
      /code/branches/network/data/levels/templates/spaceshipHXY.oxt2356
      /code/branches/network2/data/levels/templates/spaceshipHXY.oxt6434-6465
      /code/branches/network3/data/levels/templates/spaceshipHXY.oxt7196-7344
      /code/branches/network4/data/levels/templates/spaceshipHXY.oxt7497-7755
      /code/branches/network5/data/levels/templates/spaceshipHXY.oxt7757-7781
      /code/branches/network6/data/levels/templates/spaceshipHXY.oxt7823-8315
      /code/branches/network64/data/levels/templates/spaceshipHXY.oxt2210-2355
      /code/branches/notifications/data/levels/templates/spaceshipHXY.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/spaceshipHXY.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/spaceshipHXY.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/spaceshipHXY.oxt7506-7788
      /code/branches/overlay/data/levels/templates/spaceshipHXY.oxt2117-2385
      /code/branches/particles/data/levels/templates/spaceshipHXY.oxt2829-3085
      /code/branches/particles2/data/levels/templates/spaceshipHXY.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/spaceshipHXY.oxt3113-3194
      /code/branches/physics/data/levels/templates/spaceshipHXY.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/spaceshipHXY.oxt2436-2457
      /code/branches/pickup/data/levels/templates/spaceshipHXY.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/spaceshipHXY.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/spaceshipHXY.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/spaceshipHXY.oxt6594-6710
      /code/branches/pickups/data/levels/templates/spaceshipHXY.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/spaceshipHXY.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/spaceshipHXY.oxt7262-7263
      /code/branches/portals/data/levels/templates/spaceshipHXY.oxt8087-8455
      /code/branches/portals2/data/levels/templates/spaceshipHXY.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/spaceshipHXY.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/spaceshipHXY.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/spaceshipHXY.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/spaceshipHXY.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/spaceshipHXY.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/spaceshipHXY.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/spaceshipHXY.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/spaceshipHXY.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/spaceshipHXY.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/spaceshipHXY.oxt7614-7647
      /code/branches/resource/data/levels/templates/spaceshipHXY.oxt3327-3366
      /code/branches/resource2/data/levels/templates/spaceshipHXY.oxt3372-5694
      /code/branches/rocket/data/levels/templates/spaceshipHXY.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/spaceshipHXY.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/spaceshipHXY.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/spaceshipHXY.oxt6559-6989
      /code/branches/sound/data/levels/templates/spaceshipHXY.oxt2829-3010
      /code/branches/sound3/data/levels/templates/spaceshipHXY.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/spaceshipHXY.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/spaceshipHXY.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/spaceshipHXY.oxt8182-8630
      /code/branches/steering/data/levels/templates/spaceshipHXY.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/spaceshipHXY.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/spaceshipHXY.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/spaceshipHXY.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/spaceshipHXY.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/spaceshipHXY.oxt8440-8716
      /code/branches/weapon/data/levels/templates/spaceshipHXY.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/spaceshipHXY.oxt2107-2488
      /code/branches/weapons/data/levels/templates/spaceshipHXY.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/spaceshipHXY.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/spaceshipHXYSL.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/environment3/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/formation/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/hud/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/menue/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/output/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/usability/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/trunk/data/levels/templates/spaceshipHXYSL.oxtmergedeligible
      /code/branches/ai/data/levels/templates/spaceshipHXYSL.oxt6592-7033
      /code/branches/ai2/data/levels/templates/spaceshipHXYSL.oxt8721-8880
      /code/branches/bigships/data/levels/templates/spaceshipHXYSL.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/spaceshipHXYSL.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/spaceshipHXYSL.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/spaceshipHXYSL.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/spaceshipHXYSL.oxt1802-1808
      /code/branches/chat/data/levels/templates/spaceshipHXYSL.oxt6527-6797
      /code/branches/chat2/data/levels/templates/spaceshipHXYSL.oxt6836-6910
      /code/branches/console/data/levels/templates/spaceshipHXYSL.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/spaceshipHXYSL.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/spaceshipHXYSL.oxt7178-7283
      /code/branches/core3/data/levels/templates/spaceshipHXYSL.oxt1572-1739
      /code/branches/core4/data/levels/templates/spaceshipHXYSL.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/spaceshipHXYSL.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/spaceshipHXYSL.oxt7537-7686
      /code/branches/doc/data/levels/templates/spaceshipHXYSL.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/spaceshipHXYSL.oxt8101-8192
      /code/branches/dynamicmatch/data/levels/templates/spaceshipHXYSL.oxt6584-7030
      /code/branches/fps/data/levels/templates/spaceshipHXYSL.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/spaceshipHXYSL.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/spaceshipHXYSL.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/spaceshipHXYSL.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/spaceshipHXYSL.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/spaceshipHXYSL.oxt1580
      /code/branches/gui/data/levels/templates/spaceshipHXYSL.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/spaceshipHXYSL.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/spaceshipHXYSL.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/spaceshipHXYSL.oxt6000-6023
      /code/branches/input/data/levels/templates/spaceshipHXYSL.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/spaceshipHXYSL.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/spaceshipHXYSL.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/spaceshipHXYSL.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/spaceshipHXYSL.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/spaceshipHXYSL.oxt7903-8175
      /code/branches/libraries/data/levels/templates/spaceshipHXYSL.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/spaceshipHXYSL.oxt5703-5737
      /code/branches/lod/data/levels/templates/spaceshipHXYSL.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/spaceshipHXYSL.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/spaceshipHXYSL.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/spaceshipHXYSL.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/spaceshipHXYSL.oxt7502-7738
      /code/branches/menu/data/levels/templates/spaceshipHXYSL.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/spaceshipHXYSL.oxt2754-2824
      /code/branches/netp2/data/levels/templates/spaceshipHXYSL.oxt2835-2988
      /code/branches/netp3/data/levels/templates/spaceshipHXYSL.oxt2988-3082
      /code/branches/netp6/data/levels/templates/spaceshipHXYSL.oxt3214-3302
      /code/branches/network/data/levels/templates/spaceshipHXYSL.oxt2356
      /code/branches/network2/data/levels/templates/spaceshipHXYSL.oxt6434-6465
      /code/branches/network3/data/levels/templates/spaceshipHXYSL.oxt7196-7344
      /code/branches/network4/data/levels/templates/spaceshipHXYSL.oxt7497-7755
      /code/branches/network5/data/levels/templates/spaceshipHXYSL.oxt7757-7781
      /code/branches/network6/data/levels/templates/spaceshipHXYSL.oxt7823-8315
      /code/branches/network64/data/levels/templates/spaceshipHXYSL.oxt2210-2355
      /code/branches/notifications/data/levels/templates/spaceshipHXYSL.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/spaceshipHXYSL.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/spaceshipHXYSL.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/spaceshipHXYSL.oxt7506-7788
      /code/branches/overlay/data/levels/templates/spaceshipHXYSL.oxt2117-2385
      /code/branches/particles/data/levels/templates/spaceshipHXYSL.oxt2829-3085
      /code/branches/particles2/data/levels/templates/spaceshipHXYSL.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/spaceshipHXYSL.oxt3113-3194
      /code/branches/physics/data/levels/templates/spaceshipHXYSL.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/spaceshipHXYSL.oxt2436-2457
      /code/branches/pickup/data/levels/templates/spaceshipHXYSL.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/spaceshipHXYSL.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/spaceshipHXYSL.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/spaceshipHXYSL.oxt6594-6710
      /code/branches/pickups/data/levels/templates/spaceshipHXYSL.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/spaceshipHXYSL.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/spaceshipHXYSL.oxt7262-7263
      /code/branches/portals/data/levels/templates/spaceshipHXYSL.oxt8087-8455
      /code/branches/portals2/data/levels/templates/spaceshipHXYSL.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/spaceshipHXYSL.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/spaceshipHXYSL.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/spaceshipHXYSL.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/spaceshipHXYSL.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/spaceshipHXYSL.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/spaceshipHXYSL.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/spaceshipHXYSL.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/spaceshipHXYSL.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/spaceshipHXYSL.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/spaceshipHXYSL.oxt7614-7647
      /code/branches/resource/data/levels/templates/spaceshipHXYSL.oxt3327-3366
      /code/branches/resource2/data/levels/templates/spaceshipHXYSL.oxt3372-5694
      /code/branches/rocket/data/levels/templates/spaceshipHXYSL.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/spaceshipHXYSL.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/spaceshipHXYSL.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/spaceshipHXYSL.oxt6559-6989
      /code/branches/sound/data/levels/templates/spaceshipHXYSL.oxt2829-3010
      /code/branches/sound3/data/levels/templates/spaceshipHXYSL.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/spaceshipHXYSL.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/spaceshipHXYSL.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/spaceshipHXYSL.oxt8182-8630
      /code/branches/steering/data/levels/templates/spaceshipHXYSL.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/spaceshipHXYSL.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/spaceshipHXYSL.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/spaceshipHXYSL.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/spaceshipHXYSL.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/spaceshipHXYSL.oxt8440-8716
      /code/branches/weapon/data/levels/templates/spaceshipHXYSL.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/spaceshipHXYSL.oxt2107-2488
      /code/branches/weapons/data/levels/templates/spaceshipHXYSL.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/spaceshipHXYSL.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/spaceshipPirate.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/environment3/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/formation/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/hud/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/menue/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/output/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/usability/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/trunk/data/levels/templates/spaceshipPirate.oxtmergedeligible
      /code/branches/ai/data/levels/templates/spaceshipPirate.oxt6592-7033
      /code/branches/ai2/data/levels/templates/spaceshipPirate.oxt8721-8880
      /code/branches/bigships/data/levels/templates/spaceshipPirate.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/spaceshipPirate.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/spaceshipPirate.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/spaceshipPirate.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/spaceshipPirate.oxt1802-1808
      /code/branches/chat/data/levels/templates/spaceshipPirate.oxt6527-6797
      /code/branches/chat2/data/levels/templates/spaceshipPirate.oxt6836-6910
      /code/branches/console/data/levels/templates/spaceshipPirate.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/spaceshipPirate.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/spaceshipPirate.oxt7178-7283
      /code/branches/core3/data/levels/templates/spaceshipPirate.oxt1572-1739
      /code/branches/core4/data/levels/templates/spaceshipPirate.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/spaceshipPirate.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/spaceshipPirate.oxt7537-7686
      /code/branches/doc/data/levels/templates/spaceshipPirate.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/spaceshipPirate.oxt8101-8192
      /code/branches/dynamicmatch/data/levels/templates/spaceshipPirate.oxt6584-7030
      /code/branches/fps/data/levels/templates/spaceshipPirate.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/spaceshipPirate.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/spaceshipPirate.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/spaceshipPirate.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/spaceshipPirate.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/spaceshipPirate.oxt1580
      /code/branches/gui/data/levels/templates/spaceshipPirate.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/spaceshipPirate.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/spaceshipPirate.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/spaceshipPirate.oxt6000-6023
      /code/branches/input/data/levels/templates/spaceshipPirate.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/spaceshipPirate.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/spaceshipPirate.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/spaceshipPirate.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/spaceshipPirate.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/spaceshipPirate.oxt7903-8175
      /code/branches/libraries/data/levels/templates/spaceshipPirate.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/spaceshipPirate.oxt5703-5737
      /code/branches/lod/data/levels/templates/spaceshipPirate.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/spaceshipPirate.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/spaceshipPirate.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/spaceshipPirate.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/spaceshipPirate.oxt7502-7738
      /code/branches/menu/data/levels/templates/spaceshipPirate.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/spaceshipPirate.oxt2754-2824
      /code/branches/netp2/data/levels/templates/spaceshipPirate.oxt2835-2988
      /code/branches/netp3/data/levels/templates/spaceshipPirate.oxt2988-3082
      /code/branches/netp6/data/levels/templates/spaceshipPirate.oxt3214-3302
      /code/branches/network/data/levels/templates/spaceshipPirate.oxt2356
      /code/branches/network2/data/levels/templates/spaceshipPirate.oxt6434-6465
      /code/branches/network3/data/levels/templates/spaceshipPirate.oxt7196-7344
      /code/branches/network4/data/levels/templates/spaceshipPirate.oxt7497-7755
      /code/branches/network5/data/levels/templates/spaceshipPirate.oxt7757-7781
      /code/branches/network6/data/levels/templates/spaceshipPirate.oxt7823-8315
      /code/branches/network64/data/levels/templates/spaceshipPirate.oxt2210-2355
      /code/branches/notifications/data/levels/templates/spaceshipPirate.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/spaceshipPirate.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/spaceshipPirate.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/spaceshipPirate.oxt7506-7788
      /code/branches/overlay/data/levels/templates/spaceshipPirate.oxt2117-2385
      /code/branches/particles/data/levels/templates/spaceshipPirate.oxt2829-3085
      /code/branches/particles2/data/levels/templates/spaceshipPirate.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/spaceshipPirate.oxt3113-3194
      /code/branches/physics/data/levels/templates/spaceshipPirate.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/spaceshipPirate.oxt2436-2457
      /code/branches/pickup/data/levels/templates/spaceshipPirate.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/spaceshipPirate.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/spaceshipPirate.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/spaceshipPirate.oxt6594-6710
      /code/branches/pickups/data/levels/templates/spaceshipPirate.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/spaceshipPirate.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/spaceshipPirate.oxt7262-7263
      /code/branches/portals/data/levels/templates/spaceshipPirate.oxt8087-8455
      /code/branches/portals2/data/levels/templates/spaceshipPirate.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/spaceshipPirate.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/spaceshipPirate.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/spaceshipPirate.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/spaceshipPirate.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/spaceshipPirate.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/spaceshipPirate.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/spaceshipPirate.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/spaceshipPirate.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/spaceshipPirate.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/spaceshipPirate.oxt7614-7647
      /code/branches/resource/data/levels/templates/spaceshipPirate.oxt3327-3366
      /code/branches/resource2/data/levels/templates/spaceshipPirate.oxt3372-5694
      /code/branches/rocket/data/levels/templates/spaceshipPirate.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/spaceshipPirate.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/spaceshipPirate.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/spaceshipPirate.oxt6559-6989
      /code/branches/sound/data/levels/templates/spaceshipPirate.oxt2829-3010
      /code/branches/sound3/data/levels/templates/spaceshipPirate.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/spaceshipPirate.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/spaceshipPirate.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/spaceshipPirate.oxt8182-8630
      /code/branches/steering/data/levels/templates/spaceshipPirate.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/spaceshipPirate.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/spaceshipPirate.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/spaceshipPirate.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/spaceshipPirate.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/spaceshipPirate.oxt8440-8716
      /code/branches/weapon/data/levels/templates/spaceshipPirate.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/spaceshipPirate.oxt2107-2488
      /code/branches/weapons/data/levels/templates/spaceshipPirate.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/spaceshipPirate.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/spaceshipRace.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/surfaceRace/data/levels/templates/spaceshipRace.oxtmergedeligible
      /code/branches/ai/data/levels/templates/spaceshipRace.oxt6592-7033
      /code/branches/ai2/data/levels/templates/spaceshipRace.oxt8721-8880
      /code/branches/bigships/data/levels/templates/spaceshipRace.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/spaceshipRace.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/spaceshipRace.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/spaceshipRace.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/spaceshipRace.oxt1802-1808
      /code/branches/chat/data/levels/templates/spaceshipRace.oxt6527-6797
      /code/branches/chat2/data/levels/templates/spaceshipRace.oxt6836-6910
      /code/branches/console/data/levels/templates/spaceshipRace.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/spaceshipRace.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/spaceshipRace.oxt7178-7283
      /code/branches/core3/data/levels/templates/spaceshipRace.oxt1572-1739
      /code/branches/core4/data/levels/templates/spaceshipRace.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/spaceshipRace.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/spaceshipRace.oxt7537-7686
      /code/branches/doc/data/levels/templates/spaceshipRace.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/spaceshipRace.oxt8101-8192
      /code/branches/dockingsystem2/data/levels/templates/spaceshipRace.oxt8196-8560
      /code/branches/dynamicmatch/data/levels/templates/spaceshipRace.oxt6584-7030
      /code/branches/environment3/data/levels/templates/spaceshipRace.oxt8887-8975
      /code/branches/formation/data/levels/templates/spaceshipRace.oxt8885-8991
      /code/branches/fps/data/levels/templates/spaceshipRace.oxt6591-7072
      /code/branches/gamecontent/data/levels/templates/spaceshipRace.oxt8893-8968
      /code/branches/gameimmersion/data/levels/templates/spaceshipRace.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/spaceshipRace.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/spaceshipRace.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/spaceshipRace.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/spaceshipRace.oxt1580
      /code/branches/gui/data/levels/templates/spaceshipRace.oxt1635-1723,​2795-2894
      /code/branches/hud/data/levels/templates/spaceshipRace.oxt8883-8986
      /code/branches/hudelements/data/levels/templates/spaceshipRace.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/spaceshipRace.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/spaceshipRace.oxt6000-6023
      /code/branches/input/data/levels/templates/spaceshipRace.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/spaceshipRace.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/spaceshipRace.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/spaceshipRace.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/spaceshipRace.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/spaceshipRace.oxt7903-8175
      /code/branches/libraries/data/levels/templates/spaceshipRace.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/spaceshipRace.oxt5703-5737
      /code/branches/lod/data/levels/templates/spaceshipRace.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/spaceshipRace.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/spaceshipRace.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/spaceshipRace.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/spaceshipRace.oxt7502-7738
      /code/branches/masterserverfix/data/levels/templates/spaceshipRace.oxt8933-8936
      /code/branches/menu/data/levels/templates/spaceshipRace.oxt5941-6146,​6148,​7536-7687
      /code/branches/menue/data/levels/templates/spaceshipRace.oxt8884-8976
      /code/branches/miniprojects/data/levels/templates/spaceshipRace.oxt2754-2824
      /code/branches/netp2/data/levels/templates/spaceshipRace.oxt2835-2988
      /code/branches/netp3/data/levels/templates/spaceshipRace.oxt2988-3082
      /code/branches/netp6/data/levels/templates/spaceshipRace.oxt3214-3302
      /code/branches/network/data/levels/templates/spaceshipRace.oxt2356
      /code/branches/network2/data/levels/templates/spaceshipRace.oxt6434-6465
      /code/branches/network3/data/levels/templates/spaceshipRace.oxt7196-7344
      /code/branches/network4/data/levels/templates/spaceshipRace.oxt7497-7755
      /code/branches/network5/data/levels/templates/spaceshipRace.oxt7757-7781
      /code/branches/network6/data/levels/templates/spaceshipRace.oxt7823-8315
      /code/branches/network64/data/levels/templates/spaceshipRace.oxt2210-2355
      /code/branches/newlevel2012/data/levels/templates/spaceshipRace.oxt9033-9240
      /code/branches/notifications/data/levels/templates/spaceshipRace.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/spaceshipRace.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/spaceshipRace.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/spaceshipRace.oxt7506-7788
      /code/branches/output/data/levels/templates/spaceshipRace.oxt8739-8857
      /code/branches/overlay/data/levels/templates/spaceshipRace.oxt2117-2385
      /code/branches/particles/data/levels/templates/spaceshipRace.oxt2829-3085
      /code/branches/particles2/data/levels/templates/spaceshipRace.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/spaceshipRace.oxt3113-3194
      /code/branches/physics/data/levels/templates/spaceshipRace.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/spaceshipRace.oxt2436-2457
      /code/branches/pickup/data/levels/templates/spaceshipRace.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/spaceshipRace.oxt5942-6405
      /code/branches/pickup2012/data/levels/templates/spaceshipRace.oxt9029-9189
      /code/branches/pickup3/data/levels/templates/spaceshipRace.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/spaceshipRace.oxt6594-6710
      /code/branches/pickups/data/levels/templates/spaceshipRace.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/spaceshipRace.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/spaceshipRace.oxt7262-7263
      /code/branches/portals/data/levels/templates/spaceshipRace.oxt8087-8455
      /code/branches/portals2/data/levels/templates/spaceshipRace.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/spaceshipRace.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/spaceshipRace.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/spaceshipRace.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/spaceshipRace.oxt7003-7089
      /code/branches/presentation/data/levels/templates/spaceshipRace.oxt2369-2652,​2654-2660,​7736-7786,​8500-8705
      /code/branches/presentation2/data/levels/templates/spaceshipRace.oxt6106-6416,​7787-7800
      /code/branches/presentation2011/data/levels/templates/spaceshipRace.oxt8974-9015
      /code/branches/presentation3/data/levels/templates/spaceshipRace.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/spaceshipRace.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/spaceshipRace.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/spaceshipRace.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/spaceshipRace.oxt7614-7647
      /code/branches/resource/data/levels/templates/spaceshipRace.oxt3327-3366
      /code/branches/resource2/data/levels/templates/spaceshipRace.oxt3372-5694
      /code/branches/rocket/data/levels/templates/spaceshipRace.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/spaceshipRace.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/spaceshipRace.oxt1295-1953,​1955
      /code/branches/shipSelection/data/levels/templates/spaceshipRace.oxt9038-9206
      /code/branches/skybox2/data/levels/templates/spaceshipRace.oxt6559-6989
      /code/branches/sound/data/levels/templates/spaceshipRace.oxt2829-3010
      /code/branches/sound2012/data/levels/templates/spaceshipRace.oxt9205-9240
      /code/branches/sound3/data/levels/templates/spaceshipRace.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/spaceshipRace.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/spaceshipRace.oxt8460-8613
      /code/branches/spacegate/data/levels/templates/spaceshipRace.oxt9030-9215
      /code/branches/spacerace/data/levels/templates/spaceshipRace.oxt8182-8630
      /code/branches/spaceraceTwo/data/levels/templates/spaceshipRace.oxt8881-8996
      /code/branches/steering/data/levels/templates/spaceshipRace.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/spaceshipRace.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/spaceshipRace.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/spaceshipRace.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/spaceshipRace.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/spaceshipRace.oxt8440-8716
      /code/branches/usability/data/levels/templates/spaceshipRace.oxt7915-8078
      /code/branches/weapon/data/levels/templates/spaceshipRace.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/spaceshipRace.oxt2107-2488
      /code/branches/weapons/data/levels/templates/spaceshipRace.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/spaceshipRace.oxt2742-2890
      /code/trunk/data/levels/templates/spaceshipRace.oxt9189-9204
  • code/branches/presentation2012/data/levels/templates/spaceshipSpacecruiser.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/spaceshipSpacecruiser.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/spaceshipSpacecruiser.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/spaceshipSpacecruiser.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/spaceshipSpacecruiser.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/spaceshipSpacecruiser.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/spaceshipSpacecruiser.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/spaceshipSpacecruiser.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/spaceshipSpacecruiser.oxtmergedeligible
      /code/trunk/data/levels/templates/spaceshipSpacecruiser.oxtmergedeligible
      /code/branches/ai/data/levels/templates/spaceshipSpacecruiser.oxt6592-7033
      /code/branches/ai2/data/levels/templates/spaceshipSpacecruiser.oxt8721-8880
      /code/branches/bigships/data/levels/templates/spaceshipSpacecruiser.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/spaceshipSpacecruiser.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/spaceshipSpacecruiser.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/spaceshipSpacecruiser.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/spaceshipSpacecruiser.oxt1802-1808
      /code/branches/chat/data/levels/templates/spaceshipSpacecruiser.oxt6527-6797
      /code/branches/chat2/data/levels/templates/spaceshipSpacecruiser.oxt6836-6910
      /code/branches/console/data/levels/templates/spaceshipSpacecruiser.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/spaceshipSpacecruiser.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/spaceshipSpacecruiser.oxt7178-7283
      /code/branches/core3/data/levels/templates/spaceshipSpacecruiser.oxt1572-1739
      /code/branches/core4/data/levels/templates/spaceshipSpacecruiser.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/spaceshipSpacecruiser.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/spaceshipSpacecruiser.oxt7537-7686
      /code/branches/doc/data/levels/templates/spaceshipSpacecruiser.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/spaceshipSpacecruiser.oxt8101-8192
      /code/branches/dockingsystem2/data/levels/templates/spaceshipSpacecruiser.oxt8196-8560
      /code/branches/dynamicmatch/data/levels/templates/spaceshipSpacecruiser.oxt6584-7030
      /code/branches/environment3/data/levels/templates/spaceshipSpacecruiser.oxt8887-8975
      /code/branches/formation/data/levels/templates/spaceshipSpacecruiser.oxt8885-8991
      /code/branches/fps/data/levels/templates/spaceshipSpacecruiser.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/spaceshipSpacecruiser.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/spaceshipSpacecruiser.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/spaceshipSpacecruiser.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/spaceshipSpacecruiser.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/spaceshipSpacecruiser.oxt1580
      /code/branches/gui/data/levels/templates/spaceshipSpacecruiser.oxt1635-1723,​2795-2894
      /code/branches/hud/data/levels/templates/spaceshipSpacecruiser.oxt8883-8986
      /code/branches/hudelements/data/levels/templates/spaceshipSpacecruiser.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/spaceshipSpacecruiser.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/spaceshipSpacecruiser.oxt6000-6023
      /code/branches/input/data/levels/templates/spaceshipSpacecruiser.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/spaceshipSpacecruiser.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/spaceshipSpacecruiser.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/spaceshipSpacecruiser.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/spaceshipSpacecruiser.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/spaceshipSpacecruiser.oxt7903-8175
      /code/branches/libraries/data/levels/templates/spaceshipSpacecruiser.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/spaceshipSpacecruiser.oxt5703-5737
      /code/branches/lod/data/levels/templates/spaceshipSpacecruiser.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/spaceshipSpacecruiser.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/spaceshipSpacecruiser.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/spaceshipSpacecruiser.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/spaceshipSpacecruiser.oxt7502-7738
      /code/branches/menu/data/levels/templates/spaceshipSpacecruiser.oxt5941-6146,​6148,​7536-7687
      /code/branches/menue/data/levels/templates/spaceshipSpacecruiser.oxt8884-8976
      /code/branches/miniprojects/data/levels/templates/spaceshipSpacecruiser.oxt2754-2824
      /code/branches/netp2/data/levels/templates/spaceshipSpacecruiser.oxt2835-2988
      /code/branches/netp3/data/levels/templates/spaceshipSpacecruiser.oxt2988-3082
      /code/branches/netp6/data/levels/templates/spaceshipSpacecruiser.oxt3214-3302
      /code/branches/network/data/levels/templates/spaceshipSpacecruiser.oxt2356
      /code/branches/network2/data/levels/templates/spaceshipSpacecruiser.oxt6434-6465
      /code/branches/network3/data/levels/templates/spaceshipSpacecruiser.oxt7196-7344
      /code/branches/network4/data/levels/templates/spaceshipSpacecruiser.oxt7497-7755
      /code/branches/network5/data/levels/templates/spaceshipSpacecruiser.oxt7757-7781
      /code/branches/network6/data/levels/templates/spaceshipSpacecruiser.oxt7823-8315
      /code/branches/network64/data/levels/templates/spaceshipSpacecruiser.oxt2210-2355
      /code/branches/notifications/data/levels/templates/spaceshipSpacecruiser.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/spaceshipSpacecruiser.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/spaceshipSpacecruiser.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/spaceshipSpacecruiser.oxt7506-7788
      /code/branches/output/data/levels/templates/spaceshipSpacecruiser.oxt8739-8857
      /code/branches/overlay/data/levels/templates/spaceshipSpacecruiser.oxt2117-2385
      /code/branches/particles/data/levels/templates/spaceshipSpacecruiser.oxt2829-3085
      /code/branches/particles2/data/levels/templates/spaceshipSpacecruiser.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/spaceshipSpacecruiser.oxt3113-3194
      /code/branches/physics/data/levels/templates/spaceshipSpacecruiser.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/spaceshipSpacecruiser.oxt2436-2457
      /code/branches/pickup/data/levels/templates/spaceshipSpacecruiser.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/spaceshipSpacecruiser.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/spaceshipSpacecruiser.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/spaceshipSpacecruiser.oxt6594-6710
      /code/branches/pickups/data/levels/templates/spaceshipSpacecruiser.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/spaceshipSpacecruiser.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/spaceshipSpacecruiser.oxt7262-7263
      /code/branches/portals/data/levels/templates/spaceshipSpacecruiser.oxt8087-8455
      /code/branches/portals2/data/levels/templates/spaceshipSpacecruiser.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/spaceshipSpacecruiser.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/spaceshipSpacecruiser.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/spaceshipSpacecruiser.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/spaceshipSpacecruiser.oxt7003-7089
      /code/branches/presentation/data/levels/templates/spaceshipSpacecruiser.oxt2369-2652,​2654-2660,​7736-7786,​8500-8705
      /code/branches/presentation2/data/levels/templates/spaceshipSpacecruiser.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/spaceshipSpacecruiser.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/spaceshipSpacecruiser.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/spaceshipSpacecruiser.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/spaceshipSpacecruiser.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/spaceshipSpacecruiser.oxt7614-7647
      /code/branches/resource/data/levels/templates/spaceshipSpacecruiser.oxt3327-3366
      /code/branches/resource2/data/levels/templates/spaceshipSpacecruiser.oxt3372-5694
      /code/branches/rocket/data/levels/templates/spaceshipSpacecruiser.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/spaceshipSpacecruiser.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/spaceshipSpacecruiser.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/spaceshipSpacecruiser.oxt6559-6989
      /code/branches/sound/data/levels/templates/spaceshipSpacecruiser.oxt2829-3010
      /code/branches/sound3/data/levels/templates/spaceshipSpacecruiser.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/spaceshipSpacecruiser.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/spaceshipSpacecruiser.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/spaceshipSpacecruiser.oxt8182-8630
      /code/branches/spaceraceTwo/data/levels/templates/spaceshipSpacecruiser.oxt8881-8996
      /code/branches/steering/data/levels/templates/spaceshipSpacecruiser.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/spaceshipSpacecruiser.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/spaceshipSpacecruiser.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/spaceshipSpacecruiser.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/spaceshipSpacecruiser.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/spaceshipSpacecruiser.oxt8440-8716
      /code/branches/usability/data/levels/templates/spaceshipSpacecruiser.oxt7915-8078
      /code/branches/weapon/data/levels/templates/spaceshipSpacecruiser.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/spaceshipSpacecruiser.oxt2107-2488
      /code/branches/weapons/data/levels/templates/spaceshipSpacecruiser.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/spaceshipSpacecruiser.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/spaceshipSwallow.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/environment3/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/formation/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/hud/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/menue/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/output/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/usability/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/trunk/data/levels/templates/spaceshipSwallow.oxtmergedeligible
      /code/branches/ai/data/levels/templates/spaceshipSwallow.oxt6592-7033
      /code/branches/ai2/data/levels/templates/spaceshipSwallow.oxt8721-8880
      /code/branches/bigships/data/levels/templates/spaceshipSwallow.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/spaceshipSwallow.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/spaceshipSwallow.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/spaceshipSwallow.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/spaceshipSwallow.oxt1802-1808
      /code/branches/chat/data/levels/templates/spaceshipSwallow.oxt6527-6797
      /code/branches/chat2/data/levels/templates/spaceshipSwallow.oxt6836-6910
      /code/branches/console/data/levels/templates/spaceshipSwallow.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/spaceshipSwallow.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/spaceshipSwallow.oxt7178-7283
      /code/branches/core3/data/levels/templates/spaceshipSwallow.oxt1572-1739
      /code/branches/core4/data/levels/templates/spaceshipSwallow.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/spaceshipSwallow.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/spaceshipSwallow.oxt7537-7686
      /code/branches/doc/data/levels/templates/spaceshipSwallow.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/spaceshipSwallow.oxt8101-8192
      /code/branches/dynamicmatch/data/levels/templates/spaceshipSwallow.oxt6584-7030
      /code/branches/fps/data/levels/templates/spaceshipSwallow.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/spaceshipSwallow.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/spaceshipSwallow.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/spaceshipSwallow.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/spaceshipSwallow.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/spaceshipSwallow.oxt1580
      /code/branches/gui/data/levels/templates/spaceshipSwallow.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/spaceshipSwallow.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/spaceshipSwallow.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/spaceshipSwallow.oxt6000-6023
      /code/branches/input/data/levels/templates/spaceshipSwallow.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/spaceshipSwallow.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/spaceshipSwallow.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/spaceshipSwallow.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/spaceshipSwallow.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/spaceshipSwallow.oxt7903-8175
      /code/branches/libraries/data/levels/templates/spaceshipSwallow.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/spaceshipSwallow.oxt5703-5737
      /code/branches/lod/data/levels/templates/spaceshipSwallow.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/spaceshipSwallow.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/spaceshipSwallow.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/spaceshipSwallow.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/spaceshipSwallow.oxt7502-7738
      /code/branches/menu/data/levels/templates/spaceshipSwallow.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/spaceshipSwallow.oxt2754-2824
      /code/branches/netp2/data/levels/templates/spaceshipSwallow.oxt2835-2988
      /code/branches/netp3/data/levels/templates/spaceshipSwallow.oxt2988-3082
      /code/branches/netp6/data/levels/templates/spaceshipSwallow.oxt3214-3302
      /code/branches/network/data/levels/templates/spaceshipSwallow.oxt2356
      /code/branches/network2/data/levels/templates/spaceshipSwallow.oxt6434-6465
      /code/branches/network3/data/levels/templates/spaceshipSwallow.oxt7196-7344
      /code/branches/network4/data/levels/templates/spaceshipSwallow.oxt7497-7755
      /code/branches/network5/data/levels/templates/spaceshipSwallow.oxt7757-7781
      /code/branches/network6/data/levels/templates/spaceshipSwallow.oxt7823-8315
      /code/branches/network64/data/levels/templates/spaceshipSwallow.oxt2210-2355
      /code/branches/notifications/data/levels/templates/spaceshipSwallow.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/spaceshipSwallow.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/spaceshipSwallow.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/spaceshipSwallow.oxt7506-7788
      /code/branches/overlay/data/levels/templates/spaceshipSwallow.oxt2117-2385
      /code/branches/particles/data/levels/templates/spaceshipSwallow.oxt2829-3085
      /code/branches/particles2/data/levels/templates/spaceshipSwallow.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/spaceshipSwallow.oxt3113-3194
      /code/branches/physics/data/levels/templates/spaceshipSwallow.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/spaceshipSwallow.oxt2436-2457
      /code/branches/pickup/data/levels/templates/spaceshipSwallow.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/spaceshipSwallow.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/spaceshipSwallow.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/spaceshipSwallow.oxt6594-6710
      /code/branches/pickups/data/levels/templates/spaceshipSwallow.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/spaceshipSwallow.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/spaceshipSwallow.oxt7262-7263
      /code/branches/portals/data/levels/templates/spaceshipSwallow.oxt8087-8455
      /code/branches/portals2/data/levels/templates/spaceshipSwallow.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/spaceshipSwallow.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/spaceshipSwallow.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/spaceshipSwallow.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/spaceshipSwallow.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/spaceshipSwallow.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/spaceshipSwallow.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/spaceshipSwallow.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/spaceshipSwallow.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/spaceshipSwallow.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/spaceshipSwallow.oxt7614-7647
      /code/branches/resource/data/levels/templates/spaceshipSwallow.oxt3327-3366
      /code/branches/resource2/data/levels/templates/spaceshipSwallow.oxt3372-5694
      /code/branches/rocket/data/levels/templates/spaceshipSwallow.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/spaceshipSwallow.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/spaceshipSwallow.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/spaceshipSwallow.oxt6559-6989
      /code/branches/sound/data/levels/templates/spaceshipSwallow.oxt2829-3010
      /code/branches/sound3/data/levels/templates/spaceshipSwallow.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/spaceshipSwallow.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/spaceshipSwallow.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/spaceshipSwallow.oxt8182-8630
      /code/branches/steering/data/levels/templates/spaceshipSwallow.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/spaceshipSwallow.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/spaceshipSwallow.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/spaceshipSwallow.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/spaceshipSwallow.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/spaceshipSwallow.oxt8440-8716
      /code/branches/weapon/data/levels/templates/spaceshipSwallow.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/spaceshipSwallow.oxt2107-2488
      /code/branches/weapons/data/levels/templates/spaceshipSwallow.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/spaceshipSwallow.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/spaceshipTransporter.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/environment3/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/formation/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/hud/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/menue/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/output/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/usability/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/trunk/data/levels/templates/spaceshipTransporter.oxtmergedeligible
      /code/branches/ai/data/levels/templates/spaceshipTransporter.oxt6592-7033
      /code/branches/ai2/data/levels/templates/spaceshipTransporter.oxt8721-8880
      /code/branches/bigships/data/levels/templates/spaceshipTransporter.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/spaceshipTransporter.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/spaceshipTransporter.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/spaceshipTransporter.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/spaceshipTransporter.oxt1802-1808
      /code/branches/chat/data/levels/templates/spaceshipTransporter.oxt6527-6797
      /code/branches/chat2/data/levels/templates/spaceshipTransporter.oxt6836-6910
      /code/branches/console/data/levels/templates/spaceshipTransporter.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/spaceshipTransporter.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/spaceshipTransporter.oxt7178-7283
      /code/branches/core3/data/levels/templates/spaceshipTransporter.oxt1572-1739
      /code/branches/core4/data/levels/templates/spaceshipTransporter.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/spaceshipTransporter.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/spaceshipTransporter.oxt7537-7686
      /code/branches/doc/data/levels/templates/spaceshipTransporter.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/spaceshipTransporter.oxt8101-8192
      /code/branches/dynamicmatch/data/levels/templates/spaceshipTransporter.oxt6584-7030
      /code/branches/fps/data/levels/templates/spaceshipTransporter.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/spaceshipTransporter.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/spaceshipTransporter.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/spaceshipTransporter.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/spaceshipTransporter.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/spaceshipTransporter.oxt1580
      /code/branches/gui/data/levels/templates/spaceshipTransporter.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/spaceshipTransporter.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/spaceshipTransporter.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/spaceshipTransporter.oxt6000-6023
      /code/branches/input/data/levels/templates/spaceshipTransporter.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/spaceshipTransporter.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/spaceshipTransporter.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/spaceshipTransporter.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/spaceshipTransporter.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/spaceshipTransporter.oxt7903-8175
      /code/branches/libraries/data/levels/templates/spaceshipTransporter.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/spaceshipTransporter.oxt5703-5737
      /code/branches/lod/data/levels/templates/spaceshipTransporter.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/spaceshipTransporter.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/spaceshipTransporter.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/spaceshipTransporter.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/spaceshipTransporter.oxt7502-7738
      /code/branches/menu/data/levels/templates/spaceshipTransporter.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/spaceshipTransporter.oxt2754-2824
      /code/branches/netp2/data/levels/templates/spaceshipTransporter.oxt2835-2988
      /code/branches/netp3/data/levels/templates/spaceshipTransporter.oxt2988-3082
      /code/branches/netp6/data/levels/templates/spaceshipTransporter.oxt3214-3302
      /code/branches/network/data/levels/templates/spaceshipTransporter.oxt2356
      /code/branches/network2/data/levels/templates/spaceshipTransporter.oxt6434-6465
      /code/branches/network3/data/levels/templates/spaceshipTransporter.oxt7196-7344
      /code/branches/network4/data/levels/templates/spaceshipTransporter.oxt7497-7755
      /code/branches/network5/data/levels/templates/spaceshipTransporter.oxt7757-7781
      /code/branches/network6/data/levels/templates/spaceshipTransporter.oxt7823-8315
      /code/branches/network64/data/levels/templates/spaceshipTransporter.oxt2210-2355
      /code/branches/notifications/data/levels/templates/spaceshipTransporter.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/spaceshipTransporter.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/spaceshipTransporter.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/spaceshipTransporter.oxt7506-7788
      /code/branches/overlay/data/levels/templates/spaceshipTransporter.oxt2117-2385
      /code/branches/particles/data/levels/templates/spaceshipTransporter.oxt2829-3085
      /code/branches/particles2/data/levels/templates/spaceshipTransporter.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/spaceshipTransporter.oxt3113-3194
      /code/branches/physics/data/levels/templates/spaceshipTransporter.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/spaceshipTransporter.oxt2436-2457
      /code/branches/pickup/data/levels/templates/spaceshipTransporter.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/spaceshipTransporter.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/spaceshipTransporter.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/spaceshipTransporter.oxt6594-6710
      /code/branches/pickups/data/levels/templates/spaceshipTransporter.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/spaceshipTransporter.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/spaceshipTransporter.oxt7262-7263
      /code/branches/portals/data/levels/templates/spaceshipTransporter.oxt8087-8455
      /code/branches/portals2/data/levels/templates/spaceshipTransporter.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/spaceshipTransporter.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/spaceshipTransporter.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/spaceshipTransporter.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/spaceshipTransporter.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/spaceshipTransporter.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/spaceshipTransporter.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/spaceshipTransporter.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/spaceshipTransporter.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/spaceshipTransporter.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/spaceshipTransporter.oxt7614-7647
      /code/branches/resource/data/levels/templates/spaceshipTransporter.oxt3327-3366
      /code/branches/resource2/data/levels/templates/spaceshipTransporter.oxt3372-5694
      /code/branches/rocket/data/levels/templates/spaceshipTransporter.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/spaceshipTransporter.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/spaceshipTransporter.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/spaceshipTransporter.oxt6559-6989
      /code/branches/sound/data/levels/templates/spaceshipTransporter.oxt2829-3010
      /code/branches/sound3/data/levels/templates/spaceshipTransporter.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/spaceshipTransporter.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/spaceshipTransporter.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/spaceshipTransporter.oxt8182-8630
      /code/branches/steering/data/levels/templates/spaceshipTransporter.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/spaceshipTransporter.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/spaceshipTransporter.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/spaceshipTransporter.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/spaceshipTransporter.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/spaceshipTransporter.oxt8440-8716
      /code/branches/weapon/data/levels/templates/spaceshipTransporter.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/spaceshipTransporter.oxt2107-2488
      /code/branches/weapons/data/levels/templates/spaceshipTransporter.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/spaceshipTransporter.oxt2742-2890
  • code/branches/presentation2012/data/levels/templates/spaceshipTransporterSL.oxt

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/environment3/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/formation/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/gamecontent/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/hud/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/masterserverfix/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/menue/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/newlevel2012/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/output/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/pickup2012/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/presentation/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/presentation2011/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/shipSelection/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/sound2012/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/spacegate/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/spaceraceTwo/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/surfaceRace/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/usability/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/trunk/data/levels/templates/spaceshipTransporterSL.oxtmergedeligible
      /code/branches/ai/data/levels/templates/spaceshipTransporterSL.oxt6592-7033
      /code/branches/ai2/data/levels/templates/spaceshipTransporterSL.oxt8721-8880
      /code/branches/bigships/data/levels/templates/spaceshipTransporterSL.oxt8137-8588
      /code/branches/buildsystem/data/levels/templates/spaceshipTransporterSL.oxt1874-2276,​2278-2400
      /code/branches/buildsystem2/data/levels/templates/spaceshipTransporterSL.oxt2506-2658
      /code/branches/buildsystem3/data/levels/templates/spaceshipTransporterSL.oxt2662-2708
      /code/branches/ceguilua/data/levels/templates/spaceshipTransporterSL.oxt1802-1808
      /code/branches/chat/data/levels/templates/spaceshipTransporterSL.oxt6527-6797
      /code/branches/chat2/data/levels/templates/spaceshipTransporterSL.oxt6836-6910
      /code/branches/console/data/levels/templates/spaceshipTransporterSL.oxt5941-6104
      /code/branches/consolecommands2/data/levels/templates/spaceshipTransporterSL.oxt6451-7178
      /code/branches/consolecommands3/data/levels/templates/spaceshipTransporterSL.oxt7178-7283
      /code/branches/core3/data/levels/templates/spaceshipTransporterSL.oxt1572-1739
      /code/branches/core4/data/levels/templates/spaceshipTransporterSL.oxt3221-3224,​3227,​3234-3238,​3242,​3244-3250,​3252-3254,​3256,​3259-3261,​3264-3265,​3268-3275,​3277-3278,​3280,​3284-3285,​3287,​3289-3294,​3305,​3309-3310
      /code/branches/core5/data/levels/templates/spaceshipTransporterSL.oxt5768-5928,​6009
      /code/branches/data_cleanup/data/levels/templates/spaceshipTransporterSL.oxt7537-7686
      /code/branches/doc/data/levels/templates/spaceshipTransporterSL.oxt7290-7400
      /code/branches/dockingsystem/data/levels/templates/spaceshipTransporterSL.oxt8101-8192
      /code/branches/dynamicmatch/data/levels/templates/spaceshipTransporterSL.oxt6584-7030
      /code/branches/fps/data/levels/templates/spaceshipTransporterSL.oxt6591-7072
      /code/branches/gameimmersion/data/levels/templates/spaceshipTransporterSL.oxt8102-8577
      /code/branches/gamestate/data/levels/templates/spaceshipTransporterSL.oxt6430-6572,​6621-6661
      /code/branches/gamestates2/data/levels/templates/spaceshipTransporterSL.oxt6594-6745
      /code/branches/gametypes/data/levels/templates/spaceshipTransporterSL.oxt2826-3031
      /code/branches/gcc43/data/levels/templates/spaceshipTransporterSL.oxt1580
      /code/branches/gui/data/levels/templates/spaceshipTransporterSL.oxt1635-1723,​2795-2894
      /code/branches/hudelements/data/levels/templates/spaceshipTransporterSL.oxt6584-6941
      /code/branches/hudimprovements/data/levels/templates/spaceshipTransporterSL.oxt7920-8672
      /code/branches/ingamemenu/data/levels/templates/spaceshipTransporterSL.oxt6000-6023
      /code/branches/input/data/levels/templates/spaceshipTransporterSL.oxt1629-1636
      /code/branches/ipv6/data/levels/templates/spaceshipTransporterSL.oxt7293-7458
      /code/branches/kicklib/data/levels/templates/spaceshipTransporterSL.oxt7940-8096,​8098-8277
      /code/branches/kicklib2/data/levels/templates/spaceshipTransporterSL.oxt8282-8350
      /code/branches/lastmanstanding/data/levels/templates/spaceshipTransporterSL.oxt7479-7644
      /code/branches/lastmanstanding3/data/levels/templates/spaceshipTransporterSL.oxt7903-8175
      /code/branches/libraries/data/levels/templates/spaceshipTransporterSL.oxt5612-5692
      /code/branches/libraries2/data/levels/templates/spaceshipTransporterSL.oxt5703-5737
      /code/branches/lod/data/levels/templates/spaceshipTransporterSL.oxt6586-6911
      /code/branches/lodfinal/data/levels/templates/spaceshipTransporterSL.oxt2372-2411
      /code/branches/mac_osx/data/levels/templates/spaceshipTransporterSL.oxt7789-8128,​8135
      /code/branches/map/data/levels/templates/spaceshipTransporterSL.oxt2801-3086,​3089
      /code/branches/masterserver/data/levels/templates/spaceshipTransporterSL.oxt7502-7738
      /code/branches/menu/data/levels/templates/spaceshipTransporterSL.oxt5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/levels/templates/spaceshipTransporterSL.oxt2754-2824
      /code/branches/netp2/data/levels/templates/spaceshipTransporterSL.oxt2835-2988
      /code/branches/netp3/data/levels/templates/spaceshipTransporterSL.oxt2988-3082
      /code/branches/netp6/data/levels/templates/spaceshipTransporterSL.oxt3214-3302
      /code/branches/network/data/levels/templates/spaceshipTransporterSL.oxt2356
      /code/branches/network2/data/levels/templates/spaceshipTransporterSL.oxt6434-6465
      /code/branches/network3/data/levels/templates/spaceshipTransporterSL.oxt7196-7344
      /code/branches/network4/data/levels/templates/spaceshipTransporterSL.oxt7497-7755
      /code/branches/network5/data/levels/templates/spaceshipTransporterSL.oxt7757-7781
      /code/branches/network6/data/levels/templates/spaceshipTransporterSL.oxt7823-8315
      /code/branches/network64/data/levels/templates/spaceshipTransporterSL.oxt2210-2355
      /code/branches/notifications/data/levels/templates/spaceshipTransporterSL.oxt7314-7401
      /code/branches/objecthierarchy/data/levels/templates/spaceshipTransporterSL.oxt1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/levels/templates/spaceshipTransporterSL.oxt2171-2479
      /code/branches/ois_update/data/levels/templates/spaceshipTransporterSL.oxt7506-7788
      /code/branches/overlay/data/levels/templates/spaceshipTransporterSL.oxt2117-2385
      /code/branches/particles/data/levels/templates/spaceshipTransporterSL.oxt2829-3085
      /code/branches/particles2/data/levels/templates/spaceshipTransporterSL.oxt6050-6106,​6109
      /code/branches/pch/data/levels/templates/spaceshipTransporterSL.oxt3113-3194
      /code/branches/physics/data/levels/templates/spaceshipTransporterSL.oxt1912-2055,​2107-2439
      /code/branches/physics_merge/data/levels/templates/spaceshipTransporterSL.oxt2436-2457
      /code/branches/pickup/data/levels/templates/spaceshipTransporterSL.oxt8145-8555
      /code/branches/pickup2/data/levels/templates/spaceshipTransporterSL.oxt5942-6405
      /code/branches/pickup3/data/levels/templates/spaceshipTransporterSL.oxt6418-6523
      /code/branches/pickup4/data/levels/templates/spaceshipTransporterSL.oxt6594-6710
      /code/branches/pickups/data/levels/templates/spaceshipTransporterSL.oxt1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/levels/templates/spaceshipTransporterSL.oxt2107-2497,​2915-3071
      /code/branches/png2/data/levels/templates/spaceshipTransporterSL.oxt7262-7263
      /code/branches/portals/data/levels/templates/spaceshipTransporterSL.oxt8087-8455
      /code/branches/portals2/data/levels/templates/spaceshipTransporterSL.oxt8460-8602
      /code/branches/ppspickups1/data/levels/templates/spaceshipTransporterSL.oxt6552-6708
      /code/branches/ppspickups2/data/levels/templates/spaceshipTransporterSL.oxt6527-6532,​6554-6709
      /code/branches/ppspickups3/data/levels/templates/spaceshipTransporterSL.oxt6757-6997
      /code/branches/ppspickups4/data/levels/templates/spaceshipTransporterSL.oxt7003-7089
      /code/branches/presentation2/data/levels/templates/spaceshipTransporterSL.oxt6106-6416,​7787-7800
      /code/branches/presentation3/data/levels/templates/spaceshipTransporterSL.oxt6913-7162
      /code/branches/questsystem/data/levels/templates/spaceshipTransporterSL.oxt1894-2088
      /code/branches/questsystem2/data/levels/templates/spaceshipTransporterSL.oxt2107-2259
      /code/branches/questsystem5/data/levels/templates/spaceshipTransporterSL.oxt2776-2905
      /code/branches/releasetodo/data/levels/templates/spaceshipTransporterSL.oxt7614-7647
      /code/branches/resource/data/levels/templates/spaceshipTransporterSL.oxt3327-3366
      /code/branches/resource2/data/levels/templates/spaceshipTransporterSL.oxt3372-5694
      /code/branches/rocket/data/levels/templates/spaceshipTransporterSL.oxt6523-6950
      /code/branches/rocket2/data/levels/templates/spaceshipTransporterSL.oxt6953-6970
      /code/branches/script_trigger/data/levels/templates/spaceshipTransporterSL.oxt1295-1953,​1955
      /code/branches/skybox2/data/levels/templates/spaceshipTransporterSL.oxt6559-6989
      /code/branches/sound/data/levels/templates/spaceshipTransporterSL.oxt2829-3010
      /code/branches/sound3/data/levels/templates/spaceshipTransporterSL.oxt5941-6102
      /code/branches/spaceboundaries/data/levels/templates/spaceshipTransporterSL.oxt8085-8457
      /code/branches/spaceboundaries2/data/levels/templates/spaceshipTransporterSL.oxt8460-8613
      /code/branches/spacerace/data/levels/templates/spaceshipTransporterSL.oxt8182-8630
      /code/branches/steering/data/levels/templates/spaceshipTransporterSL.oxt5949-6091,​8140-8595
      /code/branches/tetris/data/levels/templates/spaceshipTransporterSL.oxt8100-8563
      /code/branches/tutoriallevel/data/levels/templates/spaceshipTransporterSL.oxt7827-8370
      /code/branches/tutoriallevel2/data/levels/templates/spaceshipTransporterSL.oxt8370-8452
      /code/branches/tutoriallevel3/data/levels/templates/spaceshipTransporterSL.oxt8453-8636
      /code/branches/unity_build/data/levels/templates/spaceshipTransporterSL.oxt8440-8716
      /code/branches/weapon/data/levels/templates/spaceshipTransporterSL.oxt1925-2094
      /code/branches/weapon2/data/levels/templates/spaceshipTransporterSL.oxt2107-2488
      /code/branches/weapons/data/levels/templates/spaceshipTransporterSL.oxt2897-3051,​8143-8591
      /code/branches/weaponsystem/data/levels/templates/spaceshipTransporterSL.oxt2742-2890
Note: See TracChangeset for help on using the changeset viewer.