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

tower defense update

Location:
code/branches/presentation2012
Files:
14 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/overlays

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlaysmergedeligible
      /code/branches/environment3/data/overlaysmergedeligible
      /code/branches/formation/data/overlaysmergedeligible
      /code/branches/gamecontent/data/overlaysmergedeligible
      /code/branches/hud/data/overlaysmergedeligible
      /code/branches/masterserverfix/data/overlaysmergedeligible
      /code/branches/menue/data/overlaysmergedeligible
      /code/branches/newlevel2012/data/overlaysmergedeligible
      /code/branches/output/data/overlaysmergedeligible
      /code/branches/pickup2012/data/overlaysmergedeligible
      /code/branches/presentation/data/overlaysmergedeligible
      /code/branches/presentation2011/data/overlaysmergedeligible
      /code/branches/shipSelection/data/overlaysmergedeligible
      /code/branches/sound2012/data/overlaysmergednon-inheritableeligible
      /code/branches/spacegate/data/overlaysmergedeligible
      /code/branches/spaceraceTwo/data/overlaysmergedeligible
      /code/branches/surfaceRace/data/overlaysmergedeligible
      /code/branches/usability/data/overlaysmergedeligible
      /code/trunk/data/overlaysmergedeligible
      /code/branches/ai/data/overlays6592-7033
      /code/branches/ai2/data/overlays8721-8880
      /code/branches/bigships/data/overlays8137-8588
      /code/branches/buildsystem/data/overlays1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays2506-2658
      /code/branches/buildsystem3/data/overlays2662-2708
      /code/branches/ceguilua/data/overlays1802-1808
      /code/branches/chat/data/overlays6527-6797
      /code/branches/chat2/data/overlays6836-6910
      /code/branches/console/data/overlays5941-6104
      /code/branches/consolecommands2/data/overlays6451-7178
      /code/branches/consolecommands3/data/overlays7178-7283
      /code/branches/core3/data/overlays1572-1739
      /code/branches/core4/data/overlays3221-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/overlays5768-5928,​6009
      /code/branches/data_cleanup/data/overlays7537-7686
      /code/branches/doc/data/overlays7290-7400
      /code/branches/dockingsystem/data/overlays8101-8192
      /code/branches/dynamicmatch/data/overlays6584-7030
      /code/branches/fps/data/overlays6591-7072
      /code/branches/gameimmersion/data/overlays8102-8577
      /code/branches/gamestate/data/overlays6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays6594-6745
      /code/branches/gametypes/data/overlays2826-3031
      /code/branches/gcc43/data/overlays1580
      /code/branches/gui/data/overlays1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays6584-6941
      /code/branches/hudimprovements/data/overlays7920-8672
      /code/branches/ingamemenu/data/overlays6000-6023
      /code/branches/input/data/overlays1629-1636
      /code/branches/ipv6/data/overlays7293-7458
      /code/branches/kicklib/data/overlays7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays8282-8350
      /code/branches/lastmanstanding/data/overlays7479-7644
      /code/branches/lastmanstanding3/data/overlays7903-8175
      /code/branches/libraries/data/overlays5612-5692
      /code/branches/libraries2/data/overlays5703-5737
      /code/branches/lod/data/overlays6586-6911
      /code/branches/lodfinal/data/overlays2372-2411
      /code/branches/mac_osx/data/overlays7789-8128,​8135
      /code/branches/map/data/overlays2801-3086,​3089
      /code/branches/masterserver/data/overlays7502-7738
      /code/branches/menu/data/overlays5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays2754-2824
      /code/branches/netp2/data/overlays2835-2988
      /code/branches/netp3/data/overlays2988-3082
      /code/branches/netp6/data/overlays3214-3302
      /code/branches/network/data/overlays2356
      /code/branches/network2/data/overlays6434-6465
      /code/branches/network3/data/overlays7196-7344
      /code/branches/network4/data/overlays7497-7755
      /code/branches/network5/data/overlays7757-7781
      /code/branches/network6/data/overlays7823-8315
      /code/branches/network64/data/overlays2210-2355
      /code/branches/notifications/data/overlays7314-7401
      /code/branches/objecthierarchy/data/overlays1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays2171-2479
      /code/branches/ois_update/data/overlays7506-7788
      /code/branches/overlay/data/overlays2117-2385
      /code/branches/particles/data/overlays2829-3085
      /code/branches/particles2/data/overlays6050-6106,​6109
      /code/branches/pch/data/overlays3113-3194
      /code/branches/physics/data/overlays1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays2436-2457
      /code/branches/pickup/data/overlays8145-8555
      /code/branches/pickup2/data/overlays5942-6405
      /code/branches/pickup3/data/overlays6418-6523
      /code/branches/pickup4/data/overlays6594-6710
      /code/branches/pickups/data/overlays1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays2107-2497,​2915-3071
      /code/branches/png2/data/overlays7262-7263
      /code/branches/portals/data/overlays8087-8455
      /code/branches/portals2/data/overlays8460-8602
      /code/branches/ppspickups1/data/overlays6552-6708
      /code/branches/ppspickups2/data/overlays6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays6757-6997
      /code/branches/ppspickups4/data/overlays7003-7089
      /code/branches/presentation2/data/overlays6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays6913-7162
      /code/branches/questsystem/data/overlays1894-2088
      /code/branches/questsystem2/data/overlays2107-2259
      /code/branches/questsystem5/data/overlays2776-2905
      /code/branches/releasetodo/data/overlays7614-7647
      /code/branches/resource/data/overlays3327-3366
      /code/branches/resource2/data/overlays3372-5694
      /code/branches/rocket/data/overlays6523-6950
      /code/branches/rocket2/data/overlays6953-6970
      /code/branches/script_trigger/data/overlays1295-1953,​1955
      /code/branches/skybox2/data/overlays6559-6989
      /code/branches/sound/data/overlays2829-3010
      /code/branches/sound3/data/overlays5941-6102
      /code/branches/spaceboundaries/data/overlays8085-8457
      /code/branches/spaceboundaries2/data/overlays8460-8613
      /code/branches/spacerace/data/overlays8182-8630
      /code/branches/steering/data/overlays5949-6091,​8140-8595
      /code/branches/tetris/data/overlays8100-8563
      /code/branches/tutoriallevel/data/overlays7827-8370
      /code/branches/tutoriallevel2/data/overlays8370-8452
      /code/branches/tutoriallevel3/data/overlays8453-8636
      /code/branches/unity_build/data/overlays8440-8716
      /code/branches/weapon/data/overlays1925-2094
      /code/branches/weapon2/data/overlays2107-2488
      /code/branches/weapons/data/overlays2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays2742-2890

  • code/branches/presentation2012/data/overlays/HUD.oxo

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlays/HUD.oxomergedeligible
      /code/branches/environment3/data/overlays/HUD.oxomergedeligible
      /code/branches/formation/data/overlays/HUD.oxomergedeligible
      /code/branches/gamecontent/data/overlays/HUD.oxomergedeligible
      /code/branches/hud/data/overlays/HUD.oxomergedeligible
      /code/branches/masterserverfix/data/overlays/HUD.oxomergedeligible
      /code/branches/menue/data/overlays/HUD.oxomergedeligible
      /code/branches/newlevel2012/data/overlays/HUD.oxomergedeligible
      /code/branches/output/data/overlays/HUD.oxomergedeligible
      /code/branches/pickup2012/data/overlays/HUD.oxomergedeligible
      /code/branches/presentation/data/overlays/HUD.oxomergedeligible
      /code/branches/presentation2011/data/overlays/HUD.oxomergedeligible
      /code/branches/shipSelection/data/overlays/HUD.oxomergedeligible
      /code/branches/sound2012/data/overlays/HUD.oxomergedeligible
      /code/branches/spacegate/data/overlays/HUD.oxomergedeligible
      /code/branches/spaceraceTwo/data/overlays/HUD.oxomergedeligible
      /code/branches/surfaceRace/data/overlays/HUD.oxomergedeligible
      /code/branches/usability/data/overlays/HUD.oxomergedeligible
      /code/trunk/data/overlays/HUD.oxomergedeligible
      /code/branches/ai/data/overlays/HUD.oxo6592-7033
      /code/branches/ai2/data/overlays/HUD.oxo8721-8880
      /code/branches/bigships/data/overlays/HUD.oxo8137-8588
      /code/branches/buildsystem/data/overlays/HUD.oxo1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays/HUD.oxo2506-2658
      /code/branches/buildsystem3/data/overlays/HUD.oxo2662-2708
      /code/branches/ceguilua/data/overlays/HUD.oxo1802-1808
      /code/branches/chat/data/overlays/HUD.oxo6527-6797
      /code/branches/chat2/data/overlays/HUD.oxo6836-6910
      /code/branches/console/data/overlays/HUD.oxo5941-6104
      /code/branches/consolecommands2/data/overlays/HUD.oxo6451-7178
      /code/branches/consolecommands3/data/overlays/HUD.oxo7178-7283
      /code/branches/core3/data/overlays/HUD.oxo1572-1739
      /code/branches/core4/data/overlays/HUD.oxo3221-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/overlays/HUD.oxo5768-5928,​6009
      /code/branches/data_cleanup/data/overlays/HUD.oxo7537-7686
      /code/branches/doc/data/overlays/HUD.oxo7290-7400
      /code/branches/dockingsystem/data/overlays/HUD.oxo8101-8192
      /code/branches/dynamicmatch/data/overlays/HUD.oxo6584-7030
      /code/branches/fps/data/overlays/HUD.oxo6591-7072
      /code/branches/gameimmersion/data/overlays/HUD.oxo8102-8577
      /code/branches/gamestate/data/overlays/HUD.oxo6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays/HUD.oxo6594-6745
      /code/branches/gametypes/data/overlays/HUD.oxo2826-3031
      /code/branches/gcc43/data/overlays/HUD.oxo1580
      /code/branches/gui/data/overlays/HUD.oxo1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays/HUD.oxo6584-6941
      /code/branches/hudimprovements/data/overlays/HUD.oxo7920-8672
      /code/branches/ingamemenu/data/overlays/HUD.oxo6000-6023
      /code/branches/input/data/overlays/HUD.oxo1629-1636
      /code/branches/ipv6/data/overlays/HUD.oxo7293-7458
      /code/branches/kicklib/data/overlays/HUD.oxo7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays/HUD.oxo8282-8350
      /code/branches/lastmanstanding/data/overlays/HUD.oxo7479-7644
      /code/branches/lastmanstanding3/data/overlays/HUD.oxo7903-8175
      /code/branches/libraries/data/overlays/HUD.oxo5612-5692
      /code/branches/libraries2/data/overlays/HUD.oxo5703-5737
      /code/branches/lod/data/overlays/HUD.oxo6586-6911
      /code/branches/lodfinal/data/overlays/HUD.oxo2372-2411
      /code/branches/mac_osx/data/overlays/HUD.oxo7789-8128,​8135
      /code/branches/map/data/overlays/HUD.oxo2801-3086,​3089
      /code/branches/masterserver/data/overlays/HUD.oxo7502-7738
      /code/branches/menu/data/overlays/HUD.oxo5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays/HUD.oxo2754-2824
      /code/branches/netp2/data/overlays/HUD.oxo2835-2988
      /code/branches/netp3/data/overlays/HUD.oxo2988-3082
      /code/branches/netp6/data/overlays/HUD.oxo3214-3302
      /code/branches/network/data/overlays/HUD.oxo2356
      /code/branches/network2/data/overlays/HUD.oxo6434-6465
      /code/branches/network3/data/overlays/HUD.oxo7196-7344
      /code/branches/network4/data/overlays/HUD.oxo7497-7755
      /code/branches/network5/data/overlays/HUD.oxo7757-7781
      /code/branches/network6/data/overlays/HUD.oxo7823-8315
      /code/branches/network64/data/overlays/HUD.oxo2210-2355
      /code/branches/notifications/data/overlays/HUD.oxo7314-7401
      /code/branches/objecthierarchy/data/overlays/HUD.oxo1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays/HUD.oxo2171-2479
      /code/branches/ois_update/data/overlays/HUD.oxo7506-7788
      /code/branches/overlay/data/overlays/HUD.oxo2117-2385
      /code/branches/particles/data/overlays/HUD.oxo2829-3085
      /code/branches/particles2/data/overlays/HUD.oxo6050-6106,​6109
      /code/branches/pch/data/overlays/HUD.oxo3113-3194
      /code/branches/physics/data/overlays/HUD.oxo1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays/HUD.oxo2436-2457
      /code/branches/pickup/data/overlays/HUD.oxo8145-8555
      /code/branches/pickup2/data/overlays/HUD.oxo5942-6405
      /code/branches/pickup3/data/overlays/HUD.oxo6418-6523
      /code/branches/pickup4/data/overlays/HUD.oxo6594-6710
      /code/branches/pickups/data/overlays/HUD.oxo1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays/HUD.oxo2107-2497,​2915-3071
      /code/branches/png2/data/overlays/HUD.oxo7262-7263
      /code/branches/portals/data/overlays/HUD.oxo8087-8455
      /code/branches/portals2/data/overlays/HUD.oxo8460-8602
      /code/branches/ppspickups1/data/overlays/HUD.oxo6552-6708
      /code/branches/ppspickups2/data/overlays/HUD.oxo6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays/HUD.oxo6757-6997
      /code/branches/ppspickups4/data/overlays/HUD.oxo7003-7089
      /code/branches/presentation2/data/overlays/HUD.oxo6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays/HUD.oxo6913-7162
      /code/branches/questsystem/data/overlays/HUD.oxo1894-2088
      /code/branches/questsystem2/data/overlays/HUD.oxo2107-2259
      /code/branches/questsystem5/data/overlays/HUD.oxo2776-2905
      /code/branches/releasetodo/data/overlays/HUD.oxo7614-7647
      /code/branches/resource/data/overlays/HUD.oxo3327-3366
      /code/branches/resource2/data/overlays/HUD.oxo3372-5694
      /code/branches/rocket/data/overlays/HUD.oxo6523-6950
      /code/branches/rocket2/data/overlays/HUD.oxo6953-6970
      /code/branches/script_trigger/data/overlays/HUD.oxo1295-1953,​1955
      /code/branches/skybox2/data/overlays/HUD.oxo6559-6989
      /code/branches/sound/data/overlays/HUD.oxo2829-3010
      /code/branches/sound3/data/overlays/HUD.oxo5941-6102
      /code/branches/spaceboundaries/data/overlays/HUD.oxo8085-8457
      /code/branches/spaceboundaries2/data/overlays/HUD.oxo8460-8613
      /code/branches/spacerace/data/overlays/HUD.oxo8182-8630
      /code/branches/steering/data/overlays/HUD.oxo5949-6091,​8140-8595
      /code/branches/tetris/data/overlays/HUD.oxo8100-8563
      /code/branches/tutoriallevel/data/overlays/HUD.oxo7827-8370
      /code/branches/tutoriallevel2/data/overlays/HUD.oxo8370-8452
      /code/branches/tutoriallevel3/data/overlays/HUD.oxo8453-8636
      /code/branches/unity_build/data/overlays/HUD.oxo8440-8716
      /code/branches/weapon/data/overlays/HUD.oxo1925-2094
      /code/branches/weapon2/data/overlays/HUD.oxo2107-2488
      /code/branches/weapons/data/overlays/HUD.oxo2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays/HUD.oxo2742-2890

  • code/branches/presentation2012/data/overlays/HUDTemplates3.oxo

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/environment3/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/formation/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/gamecontent/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/hud/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/masterserverfix/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/menue/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/newlevel2012/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/output/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/pickup2012/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/presentation/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/presentation2011/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/shipSelection/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/sound2012/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/spacegate/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/spaceraceTwo/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/surfaceRace/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/usability/data/overlays/HUDTemplates3.oxomergedeligible
      /code/trunk/data/overlays/HUDTemplates3.oxomergedeligible
      /code/branches/ai/data/overlays/HUDTemplates3.oxo6592-7033
      /code/branches/ai2/data/overlays/HUDTemplates3.oxo8721-8880
      /code/branches/bigships/data/overlays/HUDTemplates3.oxo8137-8588
      /code/branches/buildsystem/data/overlays/HUDTemplates3.oxo1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays/HUDTemplates3.oxo2506-2658
      /code/branches/buildsystem3/data/overlays/HUDTemplates3.oxo2662-2708
      /code/branches/ceguilua/data/overlays/HUDTemplates3.oxo1802-1808
      /code/branches/chat/data/overlays/HUDTemplates3.oxo6527-6797
      /code/branches/chat2/data/overlays/HUDTemplates3.oxo6836-6910
      /code/branches/console/data/overlays/HUDTemplates3.oxo5941-6104
      /code/branches/consolecommands2/data/overlays/HUDTemplates3.oxo6451-7178
      /code/branches/consolecommands3/data/overlays/HUDTemplates3.oxo7178-7283
      /code/branches/core3/data/overlays/HUDTemplates3.oxo1572-1739
      /code/branches/core4/data/overlays/HUDTemplates3.oxo3221-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/overlays/HUDTemplates3.oxo5768-5928,​6009
      /code/branches/data_cleanup/data/overlays/HUDTemplates3.oxo7537-7686
      /code/branches/doc/data/overlays/HUDTemplates3.oxo7290-7400
      /code/branches/dockingsystem/data/overlays/HUDTemplates3.oxo8101-8192
      /code/branches/dynamicmatch/data/overlays/HUDTemplates3.oxo6584-7030
      /code/branches/fps/data/overlays/HUDTemplates3.oxo6591-7072
      /code/branches/gameimmersion/data/overlays/HUDTemplates3.oxo8102-8577
      /code/branches/gamestate/data/overlays/HUDTemplates3.oxo6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays/HUDTemplates3.oxo6594-6745
      /code/branches/gametypes/data/overlays/HUDTemplates3.oxo2826-3031
      /code/branches/gcc43/data/overlays/HUDTemplates3.oxo1580
      /code/branches/gui/data/overlays/HUDTemplates3.oxo1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays/HUDTemplates3.oxo6584-6941
      /code/branches/hudimprovements/data/overlays/HUDTemplates3.oxo7920-8672
      /code/branches/ingamemenu/data/overlays/HUDTemplates3.oxo6000-6023
      /code/branches/input/data/overlays/HUDTemplates3.oxo1629-1636
      /code/branches/ipv6/data/overlays/HUDTemplates3.oxo7293-7458
      /code/branches/kicklib/data/overlays/HUDTemplates3.oxo7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays/HUDTemplates3.oxo8282-8350
      /code/branches/lastmanstanding/data/overlays/HUDTemplates3.oxo7479-7644
      /code/branches/lastmanstanding3/data/overlays/HUDTemplates3.oxo7903-8175
      /code/branches/libraries/data/overlays/HUDTemplates3.oxo5612-5692
      /code/branches/libraries2/data/overlays/HUDTemplates3.oxo5703-5737
      /code/branches/lod/data/overlays/HUDTemplates3.oxo6586-6911
      /code/branches/lodfinal/data/overlays/HUDTemplates3.oxo2372-2411
      /code/branches/mac_osx/data/overlays/HUDTemplates3.oxo7789-8128,​8135
      /code/branches/map/data/overlays/HUDTemplates3.oxo2801-3086,​3089
      /code/branches/masterserver/data/overlays/HUDTemplates3.oxo7502-7738
      /code/branches/menu/data/overlays/HUDTemplates3.oxo5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays/HUDTemplates3.oxo2754-2824
      /code/branches/netp2/data/overlays/HUDTemplates3.oxo2835-2988
      /code/branches/netp3/data/overlays/HUDTemplates3.oxo2988-3082
      /code/branches/netp6/data/overlays/HUDTemplates3.oxo3214-3302
      /code/branches/network/data/overlays/HUDTemplates3.oxo2356
      /code/branches/network2/data/overlays/HUDTemplates3.oxo6434-6465
      /code/branches/network3/data/overlays/HUDTemplates3.oxo7196-7344
      /code/branches/network4/data/overlays/HUDTemplates3.oxo7497-7755
      /code/branches/network5/data/overlays/HUDTemplates3.oxo7757-7781
      /code/branches/network6/data/overlays/HUDTemplates3.oxo7823-8315
      /code/branches/network64/data/overlays/HUDTemplates3.oxo2210-2355
      /code/branches/notifications/data/overlays/HUDTemplates3.oxo7314-7401
      /code/branches/objecthierarchy/data/overlays/HUDTemplates3.oxo1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays/HUDTemplates3.oxo2171-2479
      /code/branches/ois_update/data/overlays/HUDTemplates3.oxo7506-7788
      /code/branches/overlay/data/overlays/HUDTemplates3.oxo2117-2385
      /code/branches/particles/data/overlays/HUDTemplates3.oxo2829-3085
      /code/branches/particles2/data/overlays/HUDTemplates3.oxo6050-6106,​6109
      /code/branches/pch/data/overlays/HUDTemplates3.oxo3113-3194
      /code/branches/physics/data/overlays/HUDTemplates3.oxo1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays/HUDTemplates3.oxo2436-2457
      /code/branches/pickup/data/overlays/HUDTemplates3.oxo8145-8555
      /code/branches/pickup2/data/overlays/HUDTemplates3.oxo5942-6405
      /code/branches/pickup3/data/overlays/HUDTemplates3.oxo6418-6523
      /code/branches/pickup4/data/overlays/HUDTemplates3.oxo6594-6710
      /code/branches/pickups/data/overlays/HUDTemplates3.oxo1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays/HUDTemplates3.oxo2107-2497,​2915-3071
      /code/branches/png2/data/overlays/HUDTemplates3.oxo7262-7263
      /code/branches/portals/data/overlays/HUDTemplates3.oxo8087-8455
      /code/branches/portals2/data/overlays/HUDTemplates3.oxo8460-8602
      /code/branches/ppspickups1/data/overlays/HUDTemplates3.oxo6552-6708
      /code/branches/ppspickups2/data/overlays/HUDTemplates3.oxo6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays/HUDTemplates3.oxo6757-6997
      /code/branches/ppspickups4/data/overlays/HUDTemplates3.oxo7003-7089
      /code/branches/presentation2/data/overlays/HUDTemplates3.oxo6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays/HUDTemplates3.oxo6913-7162
      /code/branches/questsystem/data/overlays/HUDTemplates3.oxo1894-2088
      /code/branches/questsystem2/data/overlays/HUDTemplates3.oxo2107-2259
      /code/branches/questsystem5/data/overlays/HUDTemplates3.oxo2776-2905
      /code/branches/releasetodo/data/overlays/HUDTemplates3.oxo7614-7647
      /code/branches/resource/data/overlays/HUDTemplates3.oxo3327-3366
      /code/branches/resource2/data/overlays/HUDTemplates3.oxo3372-5694
      /code/branches/rocket/data/overlays/HUDTemplates3.oxo6523-6950
      /code/branches/rocket2/data/overlays/HUDTemplates3.oxo6953-6970
      /code/branches/script_trigger/data/overlays/HUDTemplates3.oxo1295-1953,​1955
      /code/branches/skybox2/data/overlays/HUDTemplates3.oxo6559-6989
      /code/branches/sound/data/overlays/HUDTemplates3.oxo2829-3010
      /code/branches/sound3/data/overlays/HUDTemplates3.oxo5941-6102
      /code/branches/spaceboundaries/data/overlays/HUDTemplates3.oxo8085-8457
      /code/branches/spaceboundaries2/data/overlays/HUDTemplates3.oxo8460-8613
      /code/branches/spacerace/data/overlays/HUDTemplates3.oxo8182-8630
      /code/branches/steering/data/overlays/HUDTemplates3.oxo5949-6091,​8140-8595
      /code/branches/tetris/data/overlays/HUDTemplates3.oxo8100-8563
      /code/branches/tutoriallevel/data/overlays/HUDTemplates3.oxo7827-8370
      /code/branches/tutoriallevel2/data/overlays/HUDTemplates3.oxo8370-8452
      /code/branches/tutoriallevel3/data/overlays/HUDTemplates3.oxo8453-8636
      /code/branches/unity_build/data/overlays/HUDTemplates3.oxo8440-8716
      /code/branches/weapon/data/overlays/HUDTemplates3.oxo1925-2094
      /code/branches/weapon2/data/overlays/HUDTemplates3.oxo2107-2488
      /code/branches/weapons/data/overlays/HUDTemplates3.oxo2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays/HUDTemplates3.oxo2742-2890

  • code/branches/presentation2012/data/overlays/HUDTemplatesFPS.oxo

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/environment3/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/formation/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/gamecontent/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/hud/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/masterserverfix/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/menue/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/newlevel2012/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/output/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/pickup2012/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/presentation/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/presentation2011/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/shipSelection/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/sound2012/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/spacegate/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/spaceraceTwo/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/surfaceRace/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/usability/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/trunk/data/overlays/HUDTemplatesFPS.oxomergedeligible
      /code/branches/ai/data/overlays/HUDTemplatesFPS.oxo6592-7033
      /code/branches/ai2/data/overlays/HUDTemplatesFPS.oxo8721-8880
      /code/branches/bigships/data/overlays/HUDTemplatesFPS.oxo8137-8588
      /code/branches/buildsystem/data/overlays/HUDTemplatesFPS.oxo1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays/HUDTemplatesFPS.oxo2506-2658
      /code/branches/buildsystem3/data/overlays/HUDTemplatesFPS.oxo2662-2708
      /code/branches/ceguilua/data/overlays/HUDTemplatesFPS.oxo1802-1808
      /code/branches/chat/data/overlays/HUDTemplatesFPS.oxo6527-6797
      /code/branches/chat2/data/overlays/HUDTemplatesFPS.oxo6836-6910
      /code/branches/console/data/overlays/HUDTemplatesFPS.oxo5941-6104
      /code/branches/consolecommands2/data/overlays/HUDTemplatesFPS.oxo6451-7178
      /code/branches/consolecommands3/data/overlays/HUDTemplatesFPS.oxo7178-7283
      /code/branches/core3/data/overlays/HUDTemplatesFPS.oxo1572-1739
      /code/branches/core4/data/overlays/HUDTemplatesFPS.oxo3221-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/overlays/HUDTemplatesFPS.oxo5768-5928,​6009
      /code/branches/data_cleanup/data/overlays/HUDTemplatesFPS.oxo7537-7686
      /code/branches/doc/data/overlays/HUDTemplatesFPS.oxo7290-7400
      /code/branches/dockingsystem/data/overlays/HUDTemplatesFPS.oxo8101-8192
      /code/branches/dynamicmatch/data/overlays/HUDTemplatesFPS.oxo6584-7030
      /code/branches/fps/data/overlays/HUDTemplatesFPS.oxo6591-7072
      /code/branches/gameimmersion/data/overlays/HUDTemplatesFPS.oxo8102-8577
      /code/branches/gamestate/data/overlays/HUDTemplatesFPS.oxo6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays/HUDTemplatesFPS.oxo6594-6745
      /code/branches/gametypes/data/overlays/HUDTemplatesFPS.oxo2826-3031
      /code/branches/gcc43/data/overlays/HUDTemplatesFPS.oxo1580
      /code/branches/gui/data/overlays/HUDTemplatesFPS.oxo1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays/HUDTemplatesFPS.oxo6584-6941
      /code/branches/hudimprovements/data/overlays/HUDTemplatesFPS.oxo7920-8672
      /code/branches/ingamemenu/data/overlays/HUDTemplatesFPS.oxo6000-6023
      /code/branches/input/data/overlays/HUDTemplatesFPS.oxo1629-1636
      /code/branches/ipv6/data/overlays/HUDTemplatesFPS.oxo7293-7458
      /code/branches/kicklib/data/overlays/HUDTemplatesFPS.oxo7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays/HUDTemplatesFPS.oxo8282-8350
      /code/branches/lastmanstanding/data/overlays/HUDTemplatesFPS.oxo7479-7644
      /code/branches/lastmanstanding3/data/overlays/HUDTemplatesFPS.oxo7903-8175
      /code/branches/libraries/data/overlays/HUDTemplatesFPS.oxo5612-5692
      /code/branches/libraries2/data/overlays/HUDTemplatesFPS.oxo5703-5737
      /code/branches/lod/data/overlays/HUDTemplatesFPS.oxo6586-6911
      /code/branches/lodfinal/data/overlays/HUDTemplatesFPS.oxo2372-2411
      /code/branches/mac_osx/data/overlays/HUDTemplatesFPS.oxo7789-8128,​8135
      /code/branches/map/data/overlays/HUDTemplatesFPS.oxo2801-3086,​3089
      /code/branches/masterserver/data/overlays/HUDTemplatesFPS.oxo7502-7738
      /code/branches/menu/data/overlays/HUDTemplatesFPS.oxo5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays/HUDTemplatesFPS.oxo2754-2824
      /code/branches/netp2/data/overlays/HUDTemplatesFPS.oxo2835-2988
      /code/branches/netp3/data/overlays/HUDTemplatesFPS.oxo2988-3082
      /code/branches/netp6/data/overlays/HUDTemplatesFPS.oxo3214-3302
      /code/branches/network/data/overlays/HUDTemplatesFPS.oxo2356
      /code/branches/network2/data/overlays/HUDTemplatesFPS.oxo6434-6465
      /code/branches/network3/data/overlays/HUDTemplatesFPS.oxo7196-7344
      /code/branches/network4/data/overlays/HUDTemplatesFPS.oxo7497-7755
      /code/branches/network5/data/overlays/HUDTemplatesFPS.oxo7757-7781
      /code/branches/network6/data/overlays/HUDTemplatesFPS.oxo7823-8315
      /code/branches/network64/data/overlays/HUDTemplatesFPS.oxo2210-2355
      /code/branches/notifications/data/overlays/HUDTemplatesFPS.oxo7314-7401
      /code/branches/objecthierarchy/data/overlays/HUDTemplatesFPS.oxo1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays/HUDTemplatesFPS.oxo2171-2479
      /code/branches/ois_update/data/overlays/HUDTemplatesFPS.oxo7506-7788
      /code/branches/overlay/data/overlays/HUDTemplatesFPS.oxo2117-2385
      /code/branches/particles/data/overlays/HUDTemplatesFPS.oxo2829-3085
      /code/branches/particles2/data/overlays/HUDTemplatesFPS.oxo6050-6106,​6109
      /code/branches/pch/data/overlays/HUDTemplatesFPS.oxo3113-3194
      /code/branches/physics/data/overlays/HUDTemplatesFPS.oxo1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays/HUDTemplatesFPS.oxo2436-2457
      /code/branches/pickup/data/overlays/HUDTemplatesFPS.oxo8145-8555
      /code/branches/pickup2/data/overlays/HUDTemplatesFPS.oxo5942-6405
      /code/branches/pickup3/data/overlays/HUDTemplatesFPS.oxo6418-6523
      /code/branches/pickup4/data/overlays/HUDTemplatesFPS.oxo6594-6710
      /code/branches/pickups/data/overlays/HUDTemplatesFPS.oxo1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays/HUDTemplatesFPS.oxo2107-2497,​2915-3071
      /code/branches/png2/data/overlays/HUDTemplatesFPS.oxo7262-7263
      /code/branches/portals/data/overlays/HUDTemplatesFPS.oxo8087-8455
      /code/branches/portals2/data/overlays/HUDTemplatesFPS.oxo8460-8602
      /code/branches/ppspickups1/data/overlays/HUDTemplatesFPS.oxo6552-6708
      /code/branches/ppspickups2/data/overlays/HUDTemplatesFPS.oxo6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays/HUDTemplatesFPS.oxo6757-6997
      /code/branches/ppspickups4/data/overlays/HUDTemplatesFPS.oxo7003-7089
      /code/branches/presentation2/data/overlays/HUDTemplatesFPS.oxo6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays/HUDTemplatesFPS.oxo6913-7162
      /code/branches/questsystem/data/overlays/HUDTemplatesFPS.oxo1894-2088
      /code/branches/questsystem2/data/overlays/HUDTemplatesFPS.oxo2107-2259
      /code/branches/questsystem5/data/overlays/HUDTemplatesFPS.oxo2776-2905
      /code/branches/releasetodo/data/overlays/HUDTemplatesFPS.oxo7614-7647
      /code/branches/resource/data/overlays/HUDTemplatesFPS.oxo3327-3366
      /code/branches/resource2/data/overlays/HUDTemplatesFPS.oxo3372-5694
      /code/branches/rocket/data/overlays/HUDTemplatesFPS.oxo6523-6950
      /code/branches/rocket2/data/overlays/HUDTemplatesFPS.oxo6953-6970
      /code/branches/script_trigger/data/overlays/HUDTemplatesFPS.oxo1295-1953,​1955
      /code/branches/skybox2/data/overlays/HUDTemplatesFPS.oxo6559-6989
      /code/branches/sound/data/overlays/HUDTemplatesFPS.oxo2829-3010
      /code/branches/sound3/data/overlays/HUDTemplatesFPS.oxo5941-6102
      /code/branches/spaceboundaries/data/overlays/HUDTemplatesFPS.oxo8085-8457
      /code/branches/spaceboundaries2/data/overlays/HUDTemplatesFPS.oxo8460-8613
      /code/branches/spacerace/data/overlays/HUDTemplatesFPS.oxo8182-8630
      /code/branches/steering/data/overlays/HUDTemplatesFPS.oxo5949-6091,​8140-8595
      /code/branches/tetris/data/overlays/HUDTemplatesFPS.oxo8100-8563
      /code/branches/tutoriallevel/data/overlays/HUDTemplatesFPS.oxo7827-8370
      /code/branches/tutoriallevel2/data/overlays/HUDTemplatesFPS.oxo8370-8452
      /code/branches/tutoriallevel3/data/overlays/HUDTemplatesFPS.oxo8453-8636
      /code/branches/unity_build/data/overlays/HUDTemplatesFPS.oxo8440-8716
      /code/branches/weapon/data/overlays/HUDTemplatesFPS.oxo1925-2094
      /code/branches/weapon2/data/overlays/HUDTemplatesFPS.oxo2107-2488
      /code/branches/weapons/data/overlays/HUDTemplatesFPS.oxo2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays/HUDTemplatesFPS.oxo2742-2890

  • code/branches/presentation2012/data/overlays/debug.oxo

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlays/debug.oxomergedeligible
      /code/branches/environment3/data/overlays/debug.oxomergedeligible
      /code/branches/formation/data/overlays/debug.oxomergedeligible
      /code/branches/gamecontent/data/overlays/debug.oxomergedeligible
      /code/branches/hud/data/overlays/debug.oxomergedeligible
      /code/branches/masterserverfix/data/overlays/debug.oxomergedeligible
      /code/branches/menue/data/overlays/debug.oxomergedeligible
      /code/branches/newlevel2012/data/overlays/debug.oxomergedeligible
      /code/branches/output/data/overlays/debug.oxomergedeligible
      /code/branches/pickup2012/data/overlays/debug.oxomergedeligible
      /code/branches/presentation/data/overlays/debug.oxomergedeligible
      /code/branches/presentation2011/data/overlays/debug.oxomergedeligible
      /code/branches/shipSelection/data/overlays/debug.oxomergedeligible
      /code/branches/sound2012/data/overlays/debug.oxomergedeligible
      /code/branches/spacegate/data/overlays/debug.oxomergedeligible
      /code/branches/spaceraceTwo/data/overlays/debug.oxomergedeligible
      /code/branches/surfaceRace/data/overlays/debug.oxomergedeligible
      /code/branches/usability/data/overlays/debug.oxomergedeligible
      /code/trunk/data/overlays/debug.oxomergedeligible
      /code/branches/ai/data/overlays/debug.oxo6592-7033
      /code/branches/ai2/data/overlays/debug.oxo8721-8880
      /code/branches/bigships/data/overlays/debug.oxo8137-8588
      /code/branches/buildsystem/data/overlays/debug.oxo1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays/debug.oxo2506-2658
      /code/branches/buildsystem3/data/overlays/debug.oxo2662-2708
      /code/branches/ceguilua/data/overlays/debug.oxo1802-1808
      /code/branches/chat/data/overlays/debug.oxo6527-6797
      /code/branches/chat2/data/overlays/debug.oxo6836-6910
      /code/branches/console/data/overlays/debug.oxo5941-6104
      /code/branches/consolecommands2/data/overlays/debug.oxo6451-7178
      /code/branches/consolecommands3/data/overlays/debug.oxo7178-7283
      /code/branches/core3/data/overlays/debug.oxo1572-1739
      /code/branches/core4/data/overlays/debug.oxo3221-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/overlays/debug.oxo5768-5928,​6009
      /code/branches/data_cleanup/data/overlays/debug.oxo7537-7686
      /code/branches/doc/data/overlays/debug.oxo7290-7400
      /code/branches/dockingsystem/data/overlays/debug.oxo8101-8192
      /code/branches/dynamicmatch/data/overlays/debug.oxo6584-7030
      /code/branches/fps/data/overlays/debug.oxo6591-7072
      /code/branches/gameimmersion/data/overlays/debug.oxo8102-8577
      /code/branches/gamestate/data/overlays/debug.oxo6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays/debug.oxo6594-6745
      /code/branches/gametypes/data/overlays/debug.oxo2826-3031
      /code/branches/gcc43/data/overlays/debug.oxo1580
      /code/branches/gui/data/overlays/debug.oxo1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays/debug.oxo6584-6941
      /code/branches/hudimprovements/data/overlays/debug.oxo7920-8672
      /code/branches/ingamemenu/data/overlays/debug.oxo6000-6023
      /code/branches/input/data/overlays/debug.oxo1629-1636
      /code/branches/ipv6/data/overlays/debug.oxo7293-7458
      /code/branches/kicklib/data/overlays/debug.oxo7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays/debug.oxo8282-8350
      /code/branches/lastmanstanding/data/overlays/debug.oxo7479-7644
      /code/branches/lastmanstanding3/data/overlays/debug.oxo7903-8175
      /code/branches/libraries/data/overlays/debug.oxo5612-5692
      /code/branches/libraries2/data/overlays/debug.oxo5703-5737
      /code/branches/lod/data/overlays/debug.oxo6586-6911
      /code/branches/lodfinal/data/overlays/debug.oxo2372-2411
      /code/branches/mac_osx/data/overlays/debug.oxo7789-8128,​8135
      /code/branches/map/data/overlays/debug.oxo2801-3086,​3089
      /code/branches/masterserver/data/overlays/debug.oxo7502-7738
      /code/branches/menu/data/overlays/debug.oxo5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays/debug.oxo2754-2824
      /code/branches/netp2/data/overlays/debug.oxo2835-2988
      /code/branches/netp3/data/overlays/debug.oxo2988-3082
      /code/branches/netp6/data/overlays/debug.oxo3214-3302
      /code/branches/network/data/overlays/debug.oxo2356
      /code/branches/network2/data/overlays/debug.oxo6434-6465
      /code/branches/network3/data/overlays/debug.oxo7196-7344
      /code/branches/network4/data/overlays/debug.oxo7497-7755
      /code/branches/network5/data/overlays/debug.oxo7757-7781
      /code/branches/network6/data/overlays/debug.oxo7823-8315
      /code/branches/network64/data/overlays/debug.oxo2210-2355
      /code/branches/notifications/data/overlays/debug.oxo7314-7401
      /code/branches/objecthierarchy/data/overlays/debug.oxo1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays/debug.oxo2171-2479
      /code/branches/ois_update/data/overlays/debug.oxo7506-7788
      /code/branches/overlay/data/overlays/debug.oxo2117-2385
      /code/branches/particles/data/overlays/debug.oxo2829-3085
      /code/branches/particles2/data/overlays/debug.oxo6050-6106,​6109
      /code/branches/pch/data/overlays/debug.oxo3113-3194
      /code/branches/physics/data/overlays/debug.oxo1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays/debug.oxo2436-2457
      /code/branches/pickup/data/overlays/debug.oxo8145-8555
      /code/branches/pickup2/data/overlays/debug.oxo5942-6405
      /code/branches/pickup3/data/overlays/debug.oxo6418-6523
      /code/branches/pickup4/data/overlays/debug.oxo6594-6710
      /code/branches/pickups/data/overlays/debug.oxo1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays/debug.oxo2107-2497,​2915-3071
      /code/branches/png2/data/overlays/debug.oxo7262-7263
      /code/branches/portals/data/overlays/debug.oxo8087-8455
      /code/branches/portals2/data/overlays/debug.oxo8460-8602
      /code/branches/ppspickups1/data/overlays/debug.oxo6552-6708
      /code/branches/ppspickups2/data/overlays/debug.oxo6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays/debug.oxo6757-6997
      /code/branches/ppspickups4/data/overlays/debug.oxo7003-7089
      /code/branches/presentation2/data/overlays/debug.oxo6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays/debug.oxo6913-7162
      /code/branches/questsystem/data/overlays/debug.oxo1894-2088
      /code/branches/questsystem2/data/overlays/debug.oxo2107-2259
      /code/branches/questsystem5/data/overlays/debug.oxo2776-2905
      /code/branches/releasetodo/data/overlays/debug.oxo7614-7647
      /code/branches/resource/data/overlays/debug.oxo3327-3366
      /code/branches/resource2/data/overlays/debug.oxo3372-5694
      /code/branches/rocket/data/overlays/debug.oxo6523-6950
      /code/branches/rocket2/data/overlays/debug.oxo6953-6970
      /code/branches/script_trigger/data/overlays/debug.oxo1295-1953,​1955
      /code/branches/skybox2/data/overlays/debug.oxo6559-6989
      /code/branches/sound/data/overlays/debug.oxo2829-3010
      /code/branches/sound3/data/overlays/debug.oxo5941-6102
      /code/branches/spaceboundaries/data/overlays/debug.oxo8085-8457
      /code/branches/spaceboundaries2/data/overlays/debug.oxo8460-8613
      /code/branches/spacerace/data/overlays/debug.oxo8182-8630
      /code/branches/steering/data/overlays/debug.oxo5949-6091,​8140-8595
      /code/branches/tetris/data/overlays/debug.oxo8100-8563
      /code/branches/tutoriallevel/data/overlays/debug.oxo7827-8370
      /code/branches/tutoriallevel2/data/overlays/debug.oxo8370-8452
      /code/branches/tutoriallevel3/data/overlays/debug.oxo8453-8636
      /code/branches/unity_build/data/overlays/debug.oxo8440-8716
      /code/branches/weapon/data/overlays/debug.oxo1925-2094
      /code/branches/weapon2/data/overlays/debug.oxo2107-2488
      /code/branches/weapons/data/overlays/debug.oxo2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays/debug.oxo2742-2890

  • code/branches/presentation2012/data/overlays/dynamicMatchHUD.oxo

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/environment3/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/formation/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/gamecontent/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/hud/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/masterserverfix/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/menue/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/newlevel2012/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/output/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/pickup2012/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/presentation/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/presentation2011/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/shipSelection/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/sound2012/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/spacegate/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/spaceraceTwo/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/surfaceRace/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/usability/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/trunk/data/overlays/dynamicMatchHUD.oxomergedeligible
      /code/branches/ai/data/overlays/dynamicMatchHUD.oxo6592-7033
      /code/branches/ai2/data/overlays/dynamicMatchHUD.oxo8721-8880
      /code/branches/bigships/data/overlays/dynamicMatchHUD.oxo8137-8588
      /code/branches/buildsystem/data/overlays/dynamicMatchHUD.oxo1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays/dynamicMatchHUD.oxo2506-2658
      /code/branches/buildsystem3/data/overlays/dynamicMatchHUD.oxo2662-2708
      /code/branches/ceguilua/data/overlays/dynamicMatchHUD.oxo1802-1808
      /code/branches/chat/data/overlays/dynamicMatchHUD.oxo6527-6797
      /code/branches/chat2/data/overlays/dynamicMatchHUD.oxo6836-6910
      /code/branches/console/data/overlays/dynamicMatchHUD.oxo5941-6104
      /code/branches/consolecommands2/data/overlays/dynamicMatchHUD.oxo6451-7178
      /code/branches/consolecommands3/data/overlays/dynamicMatchHUD.oxo7178-7283
      /code/branches/core3/data/overlays/dynamicMatchHUD.oxo1572-1739
      /code/branches/core4/data/overlays/dynamicMatchHUD.oxo3221-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/overlays/dynamicMatchHUD.oxo5768-5928,​6009
      /code/branches/data_cleanup/data/overlays/dynamicMatchHUD.oxo7537-7686
      /code/branches/doc/data/overlays/dynamicMatchHUD.oxo7290-7400
      /code/branches/dockingsystem/data/overlays/dynamicMatchHUD.oxo8101-8192
      /code/branches/dynamicmatch/data/overlays/dynamicMatchHUD.oxo6584-7030
      /code/branches/fps/data/overlays/dynamicMatchHUD.oxo6591-7072
      /code/branches/gameimmersion/data/overlays/dynamicMatchHUD.oxo8102-8577
      /code/branches/gamestate/data/overlays/dynamicMatchHUD.oxo6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays/dynamicMatchHUD.oxo6594-6745
      /code/branches/gametypes/data/overlays/dynamicMatchHUD.oxo2826-3031
      /code/branches/gcc43/data/overlays/dynamicMatchHUD.oxo1580
      /code/branches/gui/data/overlays/dynamicMatchHUD.oxo1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays/dynamicMatchHUD.oxo6584-6941
      /code/branches/hudimprovements/data/overlays/dynamicMatchHUD.oxo7920-8672
      /code/branches/ingamemenu/data/overlays/dynamicMatchHUD.oxo6000-6023
      /code/branches/input/data/overlays/dynamicMatchHUD.oxo1629-1636
      /code/branches/ipv6/data/overlays/dynamicMatchHUD.oxo7293-7458
      /code/branches/kicklib/data/overlays/dynamicMatchHUD.oxo7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays/dynamicMatchHUD.oxo8282-8350
      /code/branches/lastmanstanding/data/overlays/dynamicMatchHUD.oxo7479-7644
      /code/branches/lastmanstanding3/data/overlays/dynamicMatchHUD.oxo7903-8175
      /code/branches/libraries/data/overlays/dynamicMatchHUD.oxo5612-5692
      /code/branches/libraries2/data/overlays/dynamicMatchHUD.oxo5703-5737
      /code/branches/lod/data/overlays/dynamicMatchHUD.oxo6586-6911
      /code/branches/lodfinal/data/overlays/dynamicMatchHUD.oxo2372-2411
      /code/branches/mac_osx/data/overlays/dynamicMatchHUD.oxo7789-8128,​8135
      /code/branches/map/data/overlays/dynamicMatchHUD.oxo2801-3086,​3089
      /code/branches/masterserver/data/overlays/dynamicMatchHUD.oxo7502-7738
      /code/branches/menu/data/overlays/dynamicMatchHUD.oxo5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays/dynamicMatchHUD.oxo2754-2824
      /code/branches/netp2/data/overlays/dynamicMatchHUD.oxo2835-2988
      /code/branches/netp3/data/overlays/dynamicMatchHUD.oxo2988-3082
      /code/branches/netp6/data/overlays/dynamicMatchHUD.oxo3214-3302
      /code/branches/network/data/overlays/dynamicMatchHUD.oxo2356
      /code/branches/network2/data/overlays/dynamicMatchHUD.oxo6434-6465
      /code/branches/network3/data/overlays/dynamicMatchHUD.oxo7196-7344
      /code/branches/network4/data/overlays/dynamicMatchHUD.oxo7497-7755
      /code/branches/network5/data/overlays/dynamicMatchHUD.oxo7757-7781
      /code/branches/network6/data/overlays/dynamicMatchHUD.oxo7823-8315
      /code/branches/network64/data/overlays/dynamicMatchHUD.oxo2210-2355
      /code/branches/notifications/data/overlays/dynamicMatchHUD.oxo7314-7401
      /code/branches/objecthierarchy/data/overlays/dynamicMatchHUD.oxo1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays/dynamicMatchHUD.oxo2171-2479
      /code/branches/ois_update/data/overlays/dynamicMatchHUD.oxo7506-7788
      /code/branches/overlay/data/overlays/dynamicMatchHUD.oxo2117-2385
      /code/branches/particles/data/overlays/dynamicMatchHUD.oxo2829-3085
      /code/branches/particles2/data/overlays/dynamicMatchHUD.oxo6050-6106,​6109
      /code/branches/pch/data/overlays/dynamicMatchHUD.oxo3113-3194
      /code/branches/physics/data/overlays/dynamicMatchHUD.oxo1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays/dynamicMatchHUD.oxo2436-2457
      /code/branches/pickup/data/overlays/dynamicMatchHUD.oxo8145-8555
      /code/branches/pickup2/data/overlays/dynamicMatchHUD.oxo5942-6405
      /code/branches/pickup3/data/overlays/dynamicMatchHUD.oxo6418-6523
      /code/branches/pickup4/data/overlays/dynamicMatchHUD.oxo6594-6710
      /code/branches/pickups/data/overlays/dynamicMatchHUD.oxo1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays/dynamicMatchHUD.oxo2107-2497,​2915-3071
      /code/branches/png2/data/overlays/dynamicMatchHUD.oxo7262-7263
      /code/branches/portals/data/overlays/dynamicMatchHUD.oxo8087-8455
      /code/branches/portals2/data/overlays/dynamicMatchHUD.oxo8460-8602
      /code/branches/ppspickups1/data/overlays/dynamicMatchHUD.oxo6552-6708
      /code/branches/ppspickups2/data/overlays/dynamicMatchHUD.oxo6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays/dynamicMatchHUD.oxo6757-6997
      /code/branches/ppspickups4/data/overlays/dynamicMatchHUD.oxo7003-7089
      /code/branches/presentation2/data/overlays/dynamicMatchHUD.oxo6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays/dynamicMatchHUD.oxo6913-7162
      /code/branches/questsystem/data/overlays/dynamicMatchHUD.oxo1894-2088
      /code/branches/questsystem2/data/overlays/dynamicMatchHUD.oxo2107-2259
      /code/branches/questsystem5/data/overlays/dynamicMatchHUD.oxo2776-2905
      /code/branches/releasetodo/data/overlays/dynamicMatchHUD.oxo7614-7647
      /code/branches/resource/data/overlays/dynamicMatchHUD.oxo3327-3366
      /code/branches/resource2/data/overlays/dynamicMatchHUD.oxo3372-5694
      /code/branches/rocket/data/overlays/dynamicMatchHUD.oxo6523-6950
      /code/branches/rocket2/data/overlays/dynamicMatchHUD.oxo6953-6970
      /code/branches/script_trigger/data/overlays/dynamicMatchHUD.oxo1295-1953,​1955
      /code/branches/skybox2/data/overlays/dynamicMatchHUD.oxo6559-6989
      /code/branches/sound/data/overlays/dynamicMatchHUD.oxo2829-3010
      /code/branches/sound3/data/overlays/dynamicMatchHUD.oxo5941-6102
      /code/branches/spaceboundaries/data/overlays/dynamicMatchHUD.oxo8085-8457
      /code/branches/spaceboundaries2/data/overlays/dynamicMatchHUD.oxo8460-8613
      /code/branches/spacerace/data/overlays/dynamicMatchHUD.oxo8182-8630
      /code/branches/steering/data/overlays/dynamicMatchHUD.oxo5949-6091,​8140-8595
      /code/branches/tetris/data/overlays/dynamicMatchHUD.oxo8100-8563
      /code/branches/tutoriallevel/data/overlays/dynamicMatchHUD.oxo7827-8370
      /code/branches/tutoriallevel2/data/overlays/dynamicMatchHUD.oxo8370-8452
      /code/branches/tutoriallevel3/data/overlays/dynamicMatchHUD.oxo8453-8636
      /code/branches/unity_build/data/overlays/dynamicMatchHUD.oxo8440-8716
      /code/branches/weapon/data/overlays/dynamicMatchHUD.oxo1925-2094
      /code/branches/weapon2/data/overlays/dynamicMatchHUD.oxo2107-2488
      /code/branches/weapons/data/overlays/dynamicMatchHUD.oxo2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays/dynamicMatchHUD.oxo2742-2890

  • code/branches/presentation2012/data/overlays/lastManStandingHUD.oxo

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/environment3/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/formation/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/gamecontent/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/hud/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/masterserverfix/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/menue/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/newlevel2012/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/output/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/pickup2012/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/presentation/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/presentation2011/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/shipSelection/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/sound2012/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/spacegate/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/spaceraceTwo/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/surfaceRace/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/usability/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/trunk/data/overlays/lastManStandingHUD.oxomergedeligible
      /code/branches/ai/data/overlays/lastManStandingHUD.oxo6592-7033
      /code/branches/ai2/data/overlays/lastManStandingHUD.oxo8721-8880
      /code/branches/bigships/data/overlays/lastManStandingHUD.oxo8137-8588
      /code/branches/buildsystem/data/overlays/lastManStandingHUD.oxo1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays/lastManStandingHUD.oxo2506-2658
      /code/branches/buildsystem3/data/overlays/lastManStandingHUD.oxo2662-2708
      /code/branches/ceguilua/data/overlays/lastManStandingHUD.oxo1802-1808
      /code/branches/chat/data/overlays/lastManStandingHUD.oxo6527-6797
      /code/branches/chat2/data/overlays/lastManStandingHUD.oxo6836-6910
      /code/branches/console/data/overlays/lastManStandingHUD.oxo5941-6104
      /code/branches/consolecommands2/data/overlays/lastManStandingHUD.oxo6451-7178
      /code/branches/consolecommands3/data/overlays/lastManStandingHUD.oxo7178-7283
      /code/branches/core3/data/overlays/lastManStandingHUD.oxo1572-1739
      /code/branches/core4/data/overlays/lastManStandingHUD.oxo3221-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/overlays/lastManStandingHUD.oxo5768-5928,​6009
      /code/branches/data_cleanup/data/overlays/lastManStandingHUD.oxo7537-7686
      /code/branches/doc/data/overlays/lastManStandingHUD.oxo7290-7400
      /code/branches/dockingsystem/data/overlays/lastManStandingHUD.oxo8101-8192
      /code/branches/dynamicmatch/data/overlays/lastManStandingHUD.oxo6584-7030
      /code/branches/fps/data/overlays/lastManStandingHUD.oxo6591-7072
      /code/branches/gameimmersion/data/overlays/lastManStandingHUD.oxo8102-8577
      /code/branches/gamestate/data/overlays/lastManStandingHUD.oxo6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays/lastManStandingHUD.oxo6594-6745
      /code/branches/gametypes/data/overlays/lastManStandingHUD.oxo2826-3031
      /code/branches/gcc43/data/overlays/lastManStandingHUD.oxo1580
      /code/branches/gui/data/overlays/lastManStandingHUD.oxo1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays/lastManStandingHUD.oxo6584-6941
      /code/branches/hudimprovements/data/overlays/lastManStandingHUD.oxo7920-8672
      /code/branches/ingamemenu/data/overlays/lastManStandingHUD.oxo6000-6023
      /code/branches/input/data/overlays/lastManStandingHUD.oxo1629-1636
      /code/branches/ipv6/data/overlays/lastManStandingHUD.oxo7293-7458
      /code/branches/kicklib/data/overlays/lastManStandingHUD.oxo7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays/lastManStandingHUD.oxo8282-8350
      /code/branches/lastmanstanding/data/overlays/lastManStandingHUD.oxo7479-7644
      /code/branches/lastmanstanding3/data/overlays/lastManStandingHUD.oxo7903-8175
      /code/branches/libraries/data/overlays/lastManStandingHUD.oxo5612-5692
      /code/branches/libraries2/data/overlays/lastManStandingHUD.oxo5703-5737
      /code/branches/lod/data/overlays/lastManStandingHUD.oxo6586-6911
      /code/branches/lodfinal/data/overlays/lastManStandingHUD.oxo2372-2411
      /code/branches/mac_osx/data/overlays/lastManStandingHUD.oxo7789-8128,​8135
      /code/branches/map/data/overlays/lastManStandingHUD.oxo2801-3086,​3089
      /code/branches/masterserver/data/overlays/lastManStandingHUD.oxo7502-7738
      /code/branches/menu/data/overlays/lastManStandingHUD.oxo5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays/lastManStandingHUD.oxo2754-2824
      /code/branches/netp2/data/overlays/lastManStandingHUD.oxo2835-2988
      /code/branches/netp3/data/overlays/lastManStandingHUD.oxo2988-3082
      /code/branches/netp6/data/overlays/lastManStandingHUD.oxo3214-3302
      /code/branches/network/data/overlays/lastManStandingHUD.oxo2356
      /code/branches/network2/data/overlays/lastManStandingHUD.oxo6434-6465
      /code/branches/network3/data/overlays/lastManStandingHUD.oxo7196-7344
      /code/branches/network4/data/overlays/lastManStandingHUD.oxo7497-7755
      /code/branches/network5/data/overlays/lastManStandingHUD.oxo7757-7781
      /code/branches/network6/data/overlays/lastManStandingHUD.oxo7823-8315
      /code/branches/network64/data/overlays/lastManStandingHUD.oxo2210-2355
      /code/branches/notifications/data/overlays/lastManStandingHUD.oxo7314-7401
      /code/branches/objecthierarchy/data/overlays/lastManStandingHUD.oxo1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays/lastManStandingHUD.oxo2171-2479
      /code/branches/ois_update/data/overlays/lastManStandingHUD.oxo7506-7788
      /code/branches/overlay/data/overlays/lastManStandingHUD.oxo2117-2385
      /code/branches/particles/data/overlays/lastManStandingHUD.oxo2829-3085
      /code/branches/particles2/data/overlays/lastManStandingHUD.oxo6050-6106,​6109
      /code/branches/pch/data/overlays/lastManStandingHUD.oxo3113-3194
      /code/branches/physics/data/overlays/lastManStandingHUD.oxo1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays/lastManStandingHUD.oxo2436-2457
      /code/branches/pickup/data/overlays/lastManStandingHUD.oxo8145-8555
      /code/branches/pickup2/data/overlays/lastManStandingHUD.oxo5942-6405
      /code/branches/pickup3/data/overlays/lastManStandingHUD.oxo6418-6523
      /code/branches/pickup4/data/overlays/lastManStandingHUD.oxo6594-6710
      /code/branches/pickups/data/overlays/lastManStandingHUD.oxo1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays/lastManStandingHUD.oxo2107-2497,​2915-3071
      /code/branches/png2/data/overlays/lastManStandingHUD.oxo7262-7263
      /code/branches/portals/data/overlays/lastManStandingHUD.oxo8087-8455
      /code/branches/portals2/data/overlays/lastManStandingHUD.oxo8460-8602
      /code/branches/ppspickups1/data/overlays/lastManStandingHUD.oxo6552-6708
      /code/branches/ppspickups2/data/overlays/lastManStandingHUD.oxo6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays/lastManStandingHUD.oxo6757-6997
      /code/branches/ppspickups4/data/overlays/lastManStandingHUD.oxo7003-7089
      /code/branches/presentation2/data/overlays/lastManStandingHUD.oxo6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays/lastManStandingHUD.oxo6913-7162
      /code/branches/questsystem/data/overlays/lastManStandingHUD.oxo1894-2088
      /code/branches/questsystem2/data/overlays/lastManStandingHUD.oxo2107-2259
      /code/branches/questsystem5/data/overlays/lastManStandingHUD.oxo2776-2905
      /code/branches/releasetodo/data/overlays/lastManStandingHUD.oxo7614-7647
      /code/branches/resource/data/overlays/lastManStandingHUD.oxo3327-3366
      /code/branches/resource2/data/overlays/lastManStandingHUD.oxo3372-5694
      /code/branches/rocket/data/overlays/lastManStandingHUD.oxo6523-6950
      /code/branches/rocket2/data/overlays/lastManStandingHUD.oxo6953-6970
      /code/branches/script_trigger/data/overlays/lastManStandingHUD.oxo1295-1953,​1955
      /code/branches/skybox2/data/overlays/lastManStandingHUD.oxo6559-6989
      /code/branches/sound/data/overlays/lastManStandingHUD.oxo2829-3010
      /code/branches/sound3/data/overlays/lastManStandingHUD.oxo5941-6102
      /code/branches/spaceboundaries/data/overlays/lastManStandingHUD.oxo8085-8457
      /code/branches/spaceboundaries2/data/overlays/lastManStandingHUD.oxo8460-8613
      /code/branches/spacerace/data/overlays/lastManStandingHUD.oxo8182-8630
      /code/branches/steering/data/overlays/lastManStandingHUD.oxo5949-6091,​8140-8595
      /code/branches/tetris/data/overlays/lastManStandingHUD.oxo8100-8563
      /code/branches/tutoriallevel/data/overlays/lastManStandingHUD.oxo7827-8370
      /code/branches/tutoriallevel2/data/overlays/lastManStandingHUD.oxo8370-8452
      /code/branches/tutoriallevel3/data/overlays/lastManStandingHUD.oxo8453-8636
      /code/branches/unity_build/data/overlays/lastManStandingHUD.oxo8440-8716
      /code/branches/weapon/data/overlays/lastManStandingHUD.oxo1925-2094
      /code/branches/weapon2/data/overlays/lastManStandingHUD.oxo2107-2488
      /code/branches/weapons/data/overlays/lastManStandingHUD.oxo2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays/lastManStandingHUD.oxo2742-2890

  • code/branches/presentation2012/data/overlays/lastTeamStandingHUD.oxo

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/environment3/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/formation/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/gamecontent/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/hud/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/masterserverfix/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/menue/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/newlevel2012/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/output/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/pickup2012/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/presentation/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/presentation2011/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/shipSelection/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/sound2012/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/spacegate/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/spaceraceTwo/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/surfaceRace/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/trunk/data/overlays/lastTeamStandingHUD.oxomergedeligible
      /code/branches/ai/data/overlays/lastTeamStandingHUD.oxo6592-7033
      /code/branches/ai2/data/overlays/lastTeamStandingHUD.oxo8721-8880
      /code/branches/bigships/data/overlays/lastTeamStandingHUD.oxo8137-8588
      /code/branches/buildsystem/data/overlays/lastTeamStandingHUD.oxo1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays/lastTeamStandingHUD.oxo2506-2658
      /code/branches/buildsystem3/data/overlays/lastTeamStandingHUD.oxo2662-2708
      /code/branches/ceguilua/data/overlays/lastTeamStandingHUD.oxo1802-1808
      /code/branches/chat/data/overlays/lastTeamStandingHUD.oxo6527-6797
      /code/branches/chat2/data/overlays/lastTeamStandingHUD.oxo6836-6910
      /code/branches/console/data/overlays/lastTeamStandingHUD.oxo5941-6104
      /code/branches/consolecommands2/data/overlays/lastTeamStandingHUD.oxo6451-7178
      /code/branches/consolecommands3/data/overlays/lastTeamStandingHUD.oxo7178-7283
      /code/branches/core3/data/overlays/lastTeamStandingHUD.oxo1572-1739
      /code/branches/core4/data/overlays/lastTeamStandingHUD.oxo3221-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/overlays/lastTeamStandingHUD.oxo5768-5928,​6009
      /code/branches/data_cleanup/data/overlays/lastTeamStandingHUD.oxo7537-7686
      /code/branches/doc/data/overlays/lastTeamStandingHUD.oxo7290-7400
      /code/branches/dockingsystem/data/overlays/lastTeamStandingHUD.oxo8101-8192
      /code/branches/dynamicmatch/data/overlays/lastTeamStandingHUD.oxo6584-7030
      /code/branches/fps/data/overlays/lastTeamStandingHUD.oxo6591-7072
      /code/branches/gameimmersion/data/overlays/lastTeamStandingHUD.oxo8102-8577
      /code/branches/gamestate/data/overlays/lastTeamStandingHUD.oxo6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays/lastTeamStandingHUD.oxo6594-6745
      /code/branches/gametypes/data/overlays/lastTeamStandingHUD.oxo2826-3031
      /code/branches/gcc43/data/overlays/lastTeamStandingHUD.oxo1580
      /code/branches/gui/data/overlays/lastTeamStandingHUD.oxo1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays/lastTeamStandingHUD.oxo6584-6941
      /code/branches/hudimprovements/data/overlays/lastTeamStandingHUD.oxo7920-8672
      /code/branches/ingamemenu/data/overlays/lastTeamStandingHUD.oxo6000-6023
      /code/branches/input/data/overlays/lastTeamStandingHUD.oxo1629-1636
      /code/branches/ipv6/data/overlays/lastTeamStandingHUD.oxo7293-7458
      /code/branches/kicklib/data/overlays/lastTeamStandingHUD.oxo7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays/lastTeamStandingHUD.oxo8282-8350
      /code/branches/lastmanstanding/data/overlays/lastTeamStandingHUD.oxo7479-7644
      /code/branches/lastmanstanding3/data/overlays/lastTeamStandingHUD.oxo7903-8175
      /code/branches/libraries/data/overlays/lastTeamStandingHUD.oxo5612-5692
      /code/branches/libraries2/data/overlays/lastTeamStandingHUD.oxo5703-5737
      /code/branches/lod/data/overlays/lastTeamStandingHUD.oxo6586-6911
      /code/branches/lodfinal/data/overlays/lastTeamStandingHUD.oxo2372-2411
      /code/branches/mac_osx/data/overlays/lastTeamStandingHUD.oxo7789-8128,​8135
      /code/branches/map/data/overlays/lastTeamStandingHUD.oxo2801-3086,​3089
      /code/branches/masterserver/data/overlays/lastTeamStandingHUD.oxo7502-7738
      /code/branches/menu/data/overlays/lastTeamStandingHUD.oxo5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays/lastTeamStandingHUD.oxo2754-2824
      /code/branches/netp2/data/overlays/lastTeamStandingHUD.oxo2835-2988
      /code/branches/netp3/data/overlays/lastTeamStandingHUD.oxo2988-3082
      /code/branches/netp6/data/overlays/lastTeamStandingHUD.oxo3214-3302
      /code/branches/network/data/overlays/lastTeamStandingHUD.oxo2356
      /code/branches/network2/data/overlays/lastTeamStandingHUD.oxo6434-6465
      /code/branches/network3/data/overlays/lastTeamStandingHUD.oxo7196-7344
      /code/branches/network4/data/overlays/lastTeamStandingHUD.oxo7497-7755
      /code/branches/network5/data/overlays/lastTeamStandingHUD.oxo7757-7781
      /code/branches/network6/data/overlays/lastTeamStandingHUD.oxo7823-8315
      /code/branches/network64/data/overlays/lastTeamStandingHUD.oxo2210-2355
      /code/branches/notifications/data/overlays/lastTeamStandingHUD.oxo7314-7401
      /code/branches/objecthierarchy/data/overlays/lastTeamStandingHUD.oxo1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays/lastTeamStandingHUD.oxo2171-2479
      /code/branches/ois_update/data/overlays/lastTeamStandingHUD.oxo7506-7788
      /code/branches/overlay/data/overlays/lastTeamStandingHUD.oxo2117-2385
      /code/branches/particles/data/overlays/lastTeamStandingHUD.oxo2829-3085
      /code/branches/particles2/data/overlays/lastTeamStandingHUD.oxo6050-6106,​6109
      /code/branches/pch/data/overlays/lastTeamStandingHUD.oxo3113-3194
      /code/branches/physics/data/overlays/lastTeamStandingHUD.oxo1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays/lastTeamStandingHUD.oxo2436-2457
      /code/branches/pickup/data/overlays/lastTeamStandingHUD.oxo8145-8555
      /code/branches/pickup2/data/overlays/lastTeamStandingHUD.oxo5942-6405
      /code/branches/pickup3/data/overlays/lastTeamStandingHUD.oxo6418-6523
      /code/branches/pickup4/data/overlays/lastTeamStandingHUD.oxo6594-6710
      /code/branches/pickups/data/overlays/lastTeamStandingHUD.oxo1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays/lastTeamStandingHUD.oxo2107-2497,​2915-3071
      /code/branches/png2/data/overlays/lastTeamStandingHUD.oxo7262-7263
      /code/branches/portals/data/overlays/lastTeamStandingHUD.oxo8087-8455
      /code/branches/portals2/data/overlays/lastTeamStandingHUD.oxo8460-8602
      /code/branches/ppspickups1/data/overlays/lastTeamStandingHUD.oxo6552-6708
      /code/branches/ppspickups2/data/overlays/lastTeamStandingHUD.oxo6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays/lastTeamStandingHUD.oxo6757-6997
      /code/branches/ppspickups4/data/overlays/lastTeamStandingHUD.oxo7003-7089
      /code/branches/presentation2/data/overlays/lastTeamStandingHUD.oxo6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays/lastTeamStandingHUD.oxo6913-7162
      /code/branches/questsystem/data/overlays/lastTeamStandingHUD.oxo1894-2088
      /code/branches/questsystem2/data/overlays/lastTeamStandingHUD.oxo2107-2259
      /code/branches/questsystem5/data/overlays/lastTeamStandingHUD.oxo2776-2905
      /code/branches/releasetodo/data/overlays/lastTeamStandingHUD.oxo7614-7647
      /code/branches/resource/data/overlays/lastTeamStandingHUD.oxo3327-3366
      /code/branches/resource2/data/overlays/lastTeamStandingHUD.oxo3372-5694
      /code/branches/rocket/data/overlays/lastTeamStandingHUD.oxo6523-6950
      /code/branches/rocket2/data/overlays/lastTeamStandingHUD.oxo6953-6970
      /code/branches/script_trigger/data/overlays/lastTeamStandingHUD.oxo1295-1953,​1955
      /code/branches/skybox2/data/overlays/lastTeamStandingHUD.oxo6559-6989
      /code/branches/sound/data/overlays/lastTeamStandingHUD.oxo2829-3010
      /code/branches/sound3/data/overlays/lastTeamStandingHUD.oxo5941-6102
      /code/branches/spaceboundaries/data/overlays/lastTeamStandingHUD.oxo8085-8457
      /code/branches/spaceboundaries2/data/overlays/lastTeamStandingHUD.oxo8460-8613
      /code/branches/spacerace/data/overlays/lastTeamStandingHUD.oxo8182-8630
      /code/branches/steering/data/overlays/lastTeamStandingHUD.oxo5949-6091,​8140-8595
      /code/branches/tetris/data/overlays/lastTeamStandingHUD.oxo8100-8563
      /code/branches/tutoriallevel/data/overlays/lastTeamStandingHUD.oxo7827-8370
      /code/branches/tutoriallevel2/data/overlays/lastTeamStandingHUD.oxo8370-8452
      /code/branches/tutoriallevel3/data/overlays/lastTeamStandingHUD.oxo8453-8636
      /code/branches/unity_build/data/overlays/lastTeamStandingHUD.oxo8440-8716
      /code/branches/usability/data/overlays/lastTeamStandingHUD.oxo7915-8078
      /code/branches/weapon/data/overlays/lastTeamStandingHUD.oxo1925-2094
      /code/branches/weapon2/data/overlays/lastTeamStandingHUD.oxo2107-2488
      /code/branches/weapons/data/overlays/lastTeamStandingHUD.oxo2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays/lastTeamStandingHUD.oxo2742-2890

  • code/branches/presentation2012/data/overlays/pongHUD.oxo

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlays/pongHUD.oxomergedeligible
      /code/branches/environment3/data/overlays/pongHUD.oxomergedeligible
      /code/branches/formation/data/overlays/pongHUD.oxomergedeligible
      /code/branches/gamecontent/data/overlays/pongHUD.oxomergedeligible
      /code/branches/hud/data/overlays/pongHUD.oxomergedeligible
      /code/branches/masterserverfix/data/overlays/pongHUD.oxomergedeligible
      /code/branches/menue/data/overlays/pongHUD.oxomergedeligible
      /code/branches/newlevel2012/data/overlays/pongHUD.oxomergedeligible
      /code/branches/output/data/overlays/pongHUD.oxomergedeligible
      /code/branches/pickup2012/data/overlays/pongHUD.oxomergedeligible
      /code/branches/presentation/data/overlays/pongHUD.oxomergedeligible
      /code/branches/presentation2011/data/overlays/pongHUD.oxomergedeligible
      /code/branches/shipSelection/data/overlays/pongHUD.oxomergedeligible
      /code/branches/sound2012/data/overlays/pongHUD.oxomergedeligible
      /code/branches/spacegate/data/overlays/pongHUD.oxomergedeligible
      /code/branches/spaceraceTwo/data/overlays/pongHUD.oxomergedeligible
      /code/branches/surfaceRace/data/overlays/pongHUD.oxomergedeligible
      /code/branches/usability/data/overlays/pongHUD.oxomergedeligible
      /code/trunk/data/overlays/pongHUD.oxomergedeligible
      /code/branches/ai/data/overlays/pongHUD.oxo6592-7033
      /code/branches/ai2/data/overlays/pongHUD.oxo8721-8880
      /code/branches/bigships/data/overlays/pongHUD.oxo8137-8588
      /code/branches/buildsystem/data/overlays/pongHUD.oxo1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays/pongHUD.oxo2506-2658
      /code/branches/buildsystem3/data/overlays/pongHUD.oxo2662-2708
      /code/branches/ceguilua/data/overlays/pongHUD.oxo1802-1808
      /code/branches/chat/data/overlays/pongHUD.oxo6527-6797
      /code/branches/chat2/data/overlays/pongHUD.oxo6836-6910
      /code/branches/console/data/overlays/pongHUD.oxo5941-6104
      /code/branches/consolecommands2/data/overlays/pongHUD.oxo6451-7178
      /code/branches/consolecommands3/data/overlays/pongHUD.oxo7178-7283
      /code/branches/core3/data/overlays/pongHUD.oxo1572-1739
      /code/branches/core4/data/overlays/pongHUD.oxo3221-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/overlays/pongHUD.oxo5768-5928,​6009
      /code/branches/data_cleanup/data/overlays/pongHUD.oxo7537-7686
      /code/branches/doc/data/overlays/pongHUD.oxo7290-7400
      /code/branches/dockingsystem/data/overlays/pongHUD.oxo8101-8192
      /code/branches/dynamicmatch/data/overlays/pongHUD.oxo6584-7030
      /code/branches/fps/data/overlays/pongHUD.oxo6591-7072
      /code/branches/gameimmersion/data/overlays/pongHUD.oxo8102-8577
      /code/branches/gamestate/data/overlays/pongHUD.oxo6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays/pongHUD.oxo6594-6745
      /code/branches/gametypes/data/overlays/pongHUD.oxo2826-3031
      /code/branches/gcc43/data/overlays/pongHUD.oxo1580
      /code/branches/gui/data/overlays/pongHUD.oxo1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays/pongHUD.oxo6584-6941
      /code/branches/hudimprovements/data/overlays/pongHUD.oxo7920-8672
      /code/branches/ingamemenu/data/overlays/pongHUD.oxo6000-6023
      /code/branches/input/data/overlays/pongHUD.oxo1629-1636
      /code/branches/ipv6/data/overlays/pongHUD.oxo7293-7458
      /code/branches/kicklib/data/overlays/pongHUD.oxo7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays/pongHUD.oxo8282-8350
      /code/branches/lastmanstanding/data/overlays/pongHUD.oxo7479-7644
      /code/branches/lastmanstanding3/data/overlays/pongHUD.oxo7903-8175
      /code/branches/libraries/data/overlays/pongHUD.oxo5612-5692
      /code/branches/libraries2/data/overlays/pongHUD.oxo5703-5737
      /code/branches/lod/data/overlays/pongHUD.oxo6586-6911
      /code/branches/lodfinal/data/overlays/pongHUD.oxo2372-2411
      /code/branches/mac_osx/data/overlays/pongHUD.oxo7789-8128,​8135
      /code/branches/map/data/overlays/pongHUD.oxo2801-3086,​3089
      /code/branches/masterserver/data/overlays/pongHUD.oxo7502-7738
      /code/branches/menu/data/overlays/pongHUD.oxo5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays/pongHUD.oxo2754-2824
      /code/branches/netp2/data/overlays/pongHUD.oxo2835-2988
      /code/branches/netp3/data/overlays/pongHUD.oxo2988-3082
      /code/branches/netp6/data/overlays/pongHUD.oxo3214-3302
      /code/branches/network/data/overlays/pongHUD.oxo2356
      /code/branches/network2/data/overlays/pongHUD.oxo6434-6465
      /code/branches/network3/data/overlays/pongHUD.oxo7196-7344
      /code/branches/network4/data/overlays/pongHUD.oxo7497-7755
      /code/branches/network5/data/overlays/pongHUD.oxo7757-7781
      /code/branches/network6/data/overlays/pongHUD.oxo7823-8315
      /code/branches/network64/data/overlays/pongHUD.oxo2210-2355
      /code/branches/notifications/data/overlays/pongHUD.oxo7314-7401
      /code/branches/objecthierarchy/data/overlays/pongHUD.oxo1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays/pongHUD.oxo2171-2479
      /code/branches/ois_update/data/overlays/pongHUD.oxo7506-7788
      /code/branches/overlay/data/overlays/pongHUD.oxo2117-2385
      /code/branches/particles/data/overlays/pongHUD.oxo2829-3085
      /code/branches/particles2/data/overlays/pongHUD.oxo6050-6106,​6109
      /code/branches/pch/data/overlays/pongHUD.oxo3113-3194
      /code/branches/physics/data/overlays/pongHUD.oxo1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays/pongHUD.oxo2436-2457
      /code/branches/pickup/data/overlays/pongHUD.oxo8145-8555
      /code/branches/pickup2/data/overlays/pongHUD.oxo5942-6405
      /code/branches/pickup3/data/overlays/pongHUD.oxo6418-6523
      /code/branches/pickup4/data/overlays/pongHUD.oxo6594-6710
      /code/branches/pickups/data/overlays/pongHUD.oxo1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays/pongHUD.oxo2107-2497,​2915-3071
      /code/branches/png2/data/overlays/pongHUD.oxo7262-7263
      /code/branches/portals/data/overlays/pongHUD.oxo8087-8455
      /code/branches/portals2/data/overlays/pongHUD.oxo8460-8602
      /code/branches/ppspickups1/data/overlays/pongHUD.oxo6552-6708
      /code/branches/ppspickups2/data/overlays/pongHUD.oxo6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays/pongHUD.oxo6757-6997
      /code/branches/ppspickups4/data/overlays/pongHUD.oxo7003-7089
      /code/branches/presentation2/data/overlays/pongHUD.oxo6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays/pongHUD.oxo6913-7162
      /code/branches/questsystem/data/overlays/pongHUD.oxo1894-2088
      /code/branches/questsystem2/data/overlays/pongHUD.oxo2107-2259
      /code/branches/questsystem5/data/overlays/pongHUD.oxo2776-2905
      /code/branches/releasetodo/data/overlays/pongHUD.oxo7614-7647
      /code/branches/resource/data/overlays/pongHUD.oxo3327-3366
      /code/branches/resource2/data/overlays/pongHUD.oxo3372-5694
      /code/branches/rocket/data/overlays/pongHUD.oxo6523-6950
      /code/branches/rocket2/data/overlays/pongHUD.oxo6953-6970
      /code/branches/script_trigger/data/overlays/pongHUD.oxo1295-1953,​1955
      /code/branches/skybox2/data/overlays/pongHUD.oxo6559-6989
      /code/branches/sound/data/overlays/pongHUD.oxo2829-3010
      /code/branches/sound3/data/overlays/pongHUD.oxo5941-6102
      /code/branches/spaceboundaries/data/overlays/pongHUD.oxo8085-8457
      /code/branches/spaceboundaries2/data/overlays/pongHUD.oxo8460-8613
      /code/branches/spacerace/data/overlays/pongHUD.oxo8182-8630
      /code/branches/steering/data/overlays/pongHUD.oxo5949-6091,​8140-8595
      /code/branches/tetris/data/overlays/pongHUD.oxo8100-8563
      /code/branches/tutoriallevel/data/overlays/pongHUD.oxo7827-8370
      /code/branches/tutoriallevel2/data/overlays/pongHUD.oxo8370-8452
      /code/branches/tutoriallevel3/data/overlays/pongHUD.oxo8453-8636
      /code/branches/unity_build/data/overlays/pongHUD.oxo8440-8716
      /code/branches/weapon/data/overlays/pongHUD.oxo1925-2094
      /code/branches/weapon2/data/overlays/pongHUD.oxo2107-2488
      /code/branches/weapons/data/overlays/pongHUD.oxo2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays/pongHUD.oxo2742-2890

  • code/branches/presentation2012/data/overlays/stats.oxo

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlays/stats.oxomergedeligible
      /code/branches/environment3/data/overlays/stats.oxomergedeligible
      /code/branches/formation/data/overlays/stats.oxomergedeligible
      /code/branches/gamecontent/data/overlays/stats.oxomergedeligible
      /code/branches/hud/data/overlays/stats.oxomergedeligible
      /code/branches/masterserverfix/data/overlays/stats.oxomergedeligible
      /code/branches/menue/data/overlays/stats.oxomergedeligible
      /code/branches/newlevel2012/data/overlays/stats.oxomergedeligible
      /code/branches/output/data/overlays/stats.oxomergedeligible
      /code/branches/pickup2012/data/overlays/stats.oxomergedeligible
      /code/branches/presentation/data/overlays/stats.oxomergedeligible
      /code/branches/presentation2011/data/overlays/stats.oxomergedeligible
      /code/branches/shipSelection/data/overlays/stats.oxomergedeligible
      /code/branches/sound2012/data/overlays/stats.oxomergedeligible
      /code/branches/spacegate/data/overlays/stats.oxomergedeligible
      /code/branches/spaceraceTwo/data/overlays/stats.oxomergedeligible
      /code/branches/surfaceRace/data/overlays/stats.oxomergedeligible
      /code/branches/usability/data/overlays/stats.oxomergedeligible
      /code/trunk/data/overlays/stats.oxomergedeligible
      /code/branches/ai/data/overlays/stats.oxo6592-7033
      /code/branches/ai2/data/overlays/stats.oxo8721-8880
      /code/branches/bigships/data/overlays/stats.oxo8137-8588
      /code/branches/buildsystem/data/overlays/stats.oxo1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays/stats.oxo2506-2658
      /code/branches/buildsystem3/data/overlays/stats.oxo2662-2708
      /code/branches/ceguilua/data/overlays/stats.oxo1802-1808
      /code/branches/chat/data/overlays/stats.oxo6527-6797
      /code/branches/chat2/data/overlays/stats.oxo6836-6910
      /code/branches/console/data/overlays/stats.oxo5941-6104
      /code/branches/consolecommands2/data/overlays/stats.oxo6451-7178
      /code/branches/consolecommands3/data/overlays/stats.oxo7178-7283
      /code/branches/core3/data/overlays/stats.oxo1572-1739
      /code/branches/core4/data/overlays/stats.oxo3221-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/overlays/stats.oxo5768-5928,​6009
      /code/branches/data_cleanup/data/overlays/stats.oxo7537-7686
      /code/branches/doc/data/overlays/stats.oxo7290-7400
      /code/branches/dockingsystem/data/overlays/stats.oxo8101-8192
      /code/branches/dynamicmatch/data/overlays/stats.oxo6584-7030
      /code/branches/fps/data/overlays/stats.oxo6591-7072
      /code/branches/gameimmersion/data/overlays/stats.oxo8102-8577
      /code/branches/gamestate/data/overlays/stats.oxo6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays/stats.oxo6594-6745
      /code/branches/gametypes/data/overlays/stats.oxo2826-3031
      /code/branches/gcc43/data/overlays/stats.oxo1580
      /code/branches/gui/data/overlays/stats.oxo1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays/stats.oxo6584-6941
      /code/branches/hudimprovements/data/overlays/stats.oxo7920-8672
      /code/branches/ingamemenu/data/overlays/stats.oxo6000-6023
      /code/branches/input/data/overlays/stats.oxo1629-1636
      /code/branches/ipv6/data/overlays/stats.oxo7293-7458
      /code/branches/kicklib/data/overlays/stats.oxo7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays/stats.oxo8282-8350
      /code/branches/lastmanstanding/data/overlays/stats.oxo7479-7644
      /code/branches/lastmanstanding3/data/overlays/stats.oxo7903-8175
      /code/branches/libraries/data/overlays/stats.oxo5612-5692
      /code/branches/libraries2/data/overlays/stats.oxo5703-5737
      /code/branches/lod/data/overlays/stats.oxo6586-6911
      /code/branches/lodfinal/data/overlays/stats.oxo2372-2411
      /code/branches/mac_osx/data/overlays/stats.oxo7789-8128,​8135
      /code/branches/map/data/overlays/stats.oxo2801-3086,​3089
      /code/branches/masterserver/data/overlays/stats.oxo7502-7738
      /code/branches/menu/data/overlays/stats.oxo5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays/stats.oxo2754-2824
      /code/branches/netp2/data/overlays/stats.oxo2835-2988
      /code/branches/netp3/data/overlays/stats.oxo2988-3082
      /code/branches/netp6/data/overlays/stats.oxo3214-3302
      /code/branches/network/data/overlays/stats.oxo2356
      /code/branches/network2/data/overlays/stats.oxo6434-6465
      /code/branches/network3/data/overlays/stats.oxo7196-7344
      /code/branches/network4/data/overlays/stats.oxo7497-7755
      /code/branches/network5/data/overlays/stats.oxo7757-7781
      /code/branches/network6/data/overlays/stats.oxo7823-8315
      /code/branches/network64/data/overlays/stats.oxo2210-2355
      /code/branches/notifications/data/overlays/stats.oxo7314-7401
      /code/branches/objecthierarchy/data/overlays/stats.oxo1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays/stats.oxo2171-2479
      /code/branches/ois_update/data/overlays/stats.oxo7506-7788
      /code/branches/overlay/data/overlays/stats.oxo2117-2385
      /code/branches/particles/data/overlays/stats.oxo2829-3085
      /code/branches/particles2/data/overlays/stats.oxo6050-6106,​6109
      /code/branches/pch/data/overlays/stats.oxo3113-3194
      /code/branches/physics/data/overlays/stats.oxo1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays/stats.oxo2436-2457
      /code/branches/pickup/data/overlays/stats.oxo8145-8555
      /code/branches/pickup2/data/overlays/stats.oxo5942-6405
      /code/branches/pickup3/data/overlays/stats.oxo6418-6523
      /code/branches/pickup4/data/overlays/stats.oxo6594-6710
      /code/branches/pickups/data/overlays/stats.oxo1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays/stats.oxo2107-2497,​2915-3071
      /code/branches/png2/data/overlays/stats.oxo7262-7263
      /code/branches/portals/data/overlays/stats.oxo8087-8455
      /code/branches/portals2/data/overlays/stats.oxo8460-8602
      /code/branches/ppspickups1/data/overlays/stats.oxo6552-6708
      /code/branches/ppspickups2/data/overlays/stats.oxo6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays/stats.oxo6757-6997
      /code/branches/ppspickups4/data/overlays/stats.oxo7003-7089
      /code/branches/presentation2/data/overlays/stats.oxo6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays/stats.oxo6913-7162
      /code/branches/questsystem/data/overlays/stats.oxo1894-2088
      /code/branches/questsystem2/data/overlays/stats.oxo2107-2259
      /code/branches/questsystem5/data/overlays/stats.oxo2776-2905
      /code/branches/releasetodo/data/overlays/stats.oxo7614-7647
      /code/branches/resource/data/overlays/stats.oxo3327-3366
      /code/branches/resource2/data/overlays/stats.oxo3372-5694
      /code/branches/rocket/data/overlays/stats.oxo6523-6950
      /code/branches/rocket2/data/overlays/stats.oxo6953-6970
      /code/branches/script_trigger/data/overlays/stats.oxo1295-1953,​1955
      /code/branches/skybox2/data/overlays/stats.oxo6559-6989
      /code/branches/sound/data/overlays/stats.oxo2829-3010
      /code/branches/sound3/data/overlays/stats.oxo5941-6102
      /code/branches/spaceboundaries/data/overlays/stats.oxo8085-8457
      /code/branches/spaceboundaries2/data/overlays/stats.oxo8460-8613
      /code/branches/spacerace/data/overlays/stats.oxo8182-8630
      /code/branches/steering/data/overlays/stats.oxo5949-6091,​8140-8595
      /code/branches/tetris/data/overlays/stats.oxo8100-8563
      /code/branches/tutoriallevel/data/overlays/stats.oxo7827-8370
      /code/branches/tutoriallevel2/data/overlays/stats.oxo8370-8452
      /code/branches/tutoriallevel3/data/overlays/stats.oxo8453-8636
      /code/branches/unity_build/data/overlays/stats.oxo8440-8716
      /code/branches/weapon/data/overlays/stats.oxo1925-2094
      /code/branches/weapon2/data/overlays/stats.oxo2107-2488
      /code/branches/weapons/data/overlays/stats.oxo2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays/stats.oxo2742-2890

  • code/branches/presentation2012/data/overlays/teamBaseMatchHUD.oxo

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/environment3/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/formation/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/gamecontent/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/hud/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/masterserverfix/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/menue/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/newlevel2012/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/output/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/pickup2012/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/presentation/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/presentation2011/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/shipSelection/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/sound2012/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/spacegate/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/spaceraceTwo/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/surfaceRace/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/usability/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/trunk/data/overlays/teamBaseMatchHUD.oxomergedeligible
      /code/branches/ai/data/overlays/teamBaseMatchHUD.oxo6592-7033
      /code/branches/ai2/data/overlays/teamBaseMatchHUD.oxo8721-8880
      /code/branches/bigships/data/overlays/teamBaseMatchHUD.oxo8137-8588
      /code/branches/buildsystem/data/overlays/teamBaseMatchHUD.oxo1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays/teamBaseMatchHUD.oxo2506-2658
      /code/branches/buildsystem3/data/overlays/teamBaseMatchHUD.oxo2662-2708
      /code/branches/ceguilua/data/overlays/teamBaseMatchHUD.oxo1802-1808
      /code/branches/chat/data/overlays/teamBaseMatchHUD.oxo6527-6797
      /code/branches/chat2/data/overlays/teamBaseMatchHUD.oxo6836-6910
      /code/branches/console/data/overlays/teamBaseMatchHUD.oxo5941-6104
      /code/branches/consolecommands2/data/overlays/teamBaseMatchHUD.oxo6451-7178
      /code/branches/consolecommands3/data/overlays/teamBaseMatchHUD.oxo7178-7283
      /code/branches/core3/data/overlays/teamBaseMatchHUD.oxo1572-1739
      /code/branches/core4/data/overlays/teamBaseMatchHUD.oxo3221-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/overlays/teamBaseMatchHUD.oxo5768-5928,​6009
      /code/branches/data_cleanup/data/overlays/teamBaseMatchHUD.oxo7537-7686
      /code/branches/doc/data/overlays/teamBaseMatchHUD.oxo7290-7400
      /code/branches/dockingsystem/data/overlays/teamBaseMatchHUD.oxo8101-8192
      /code/branches/dynamicmatch/data/overlays/teamBaseMatchHUD.oxo6584-7030
      /code/branches/fps/data/overlays/teamBaseMatchHUD.oxo6591-7072
      /code/branches/gameimmersion/data/overlays/teamBaseMatchHUD.oxo8102-8577
      /code/branches/gamestate/data/overlays/teamBaseMatchHUD.oxo6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays/teamBaseMatchHUD.oxo6594-6745
      /code/branches/gametypes/data/overlays/teamBaseMatchHUD.oxo2826-3031
      /code/branches/gcc43/data/overlays/teamBaseMatchHUD.oxo1580
      /code/branches/gui/data/overlays/teamBaseMatchHUD.oxo1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays/teamBaseMatchHUD.oxo6584-6941
      /code/branches/hudimprovements/data/overlays/teamBaseMatchHUD.oxo7920-8672
      /code/branches/ingamemenu/data/overlays/teamBaseMatchHUD.oxo6000-6023
      /code/branches/input/data/overlays/teamBaseMatchHUD.oxo1629-1636
      /code/branches/ipv6/data/overlays/teamBaseMatchHUD.oxo7293-7458
      /code/branches/kicklib/data/overlays/teamBaseMatchHUD.oxo7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays/teamBaseMatchHUD.oxo8282-8350
      /code/branches/lastmanstanding/data/overlays/teamBaseMatchHUD.oxo7479-7644
      /code/branches/lastmanstanding3/data/overlays/teamBaseMatchHUD.oxo7903-8175
      /code/branches/libraries/data/overlays/teamBaseMatchHUD.oxo5612-5692
      /code/branches/libraries2/data/overlays/teamBaseMatchHUD.oxo5703-5737
      /code/branches/lod/data/overlays/teamBaseMatchHUD.oxo6586-6911
      /code/branches/lodfinal/data/overlays/teamBaseMatchHUD.oxo2372-2411
      /code/branches/mac_osx/data/overlays/teamBaseMatchHUD.oxo7789-8128,​8135
      /code/branches/map/data/overlays/teamBaseMatchHUD.oxo2801-3086,​3089
      /code/branches/masterserver/data/overlays/teamBaseMatchHUD.oxo7502-7738
      /code/branches/menu/data/overlays/teamBaseMatchHUD.oxo5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays/teamBaseMatchHUD.oxo2754-2824
      /code/branches/netp2/data/overlays/teamBaseMatchHUD.oxo2835-2988
      /code/branches/netp3/data/overlays/teamBaseMatchHUD.oxo2988-3082
      /code/branches/netp6/data/overlays/teamBaseMatchHUD.oxo3214-3302
      /code/branches/network/data/overlays/teamBaseMatchHUD.oxo2356
      /code/branches/network2/data/overlays/teamBaseMatchHUD.oxo6434-6465
      /code/branches/network3/data/overlays/teamBaseMatchHUD.oxo7196-7344
      /code/branches/network4/data/overlays/teamBaseMatchHUD.oxo7497-7755
      /code/branches/network5/data/overlays/teamBaseMatchHUD.oxo7757-7781
      /code/branches/network6/data/overlays/teamBaseMatchHUD.oxo7823-8315
      /code/branches/network64/data/overlays/teamBaseMatchHUD.oxo2210-2355
      /code/branches/notifications/data/overlays/teamBaseMatchHUD.oxo7314-7401
      /code/branches/objecthierarchy/data/overlays/teamBaseMatchHUD.oxo1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays/teamBaseMatchHUD.oxo2171-2479
      /code/branches/ois_update/data/overlays/teamBaseMatchHUD.oxo7506-7788
      /code/branches/overlay/data/overlays/teamBaseMatchHUD.oxo2117-2385
      /code/branches/particles/data/overlays/teamBaseMatchHUD.oxo2829-3085
      /code/branches/particles2/data/overlays/teamBaseMatchHUD.oxo6050-6106,​6109
      /code/branches/pch/data/overlays/teamBaseMatchHUD.oxo3113-3194
      /code/branches/physics/data/overlays/teamBaseMatchHUD.oxo1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays/teamBaseMatchHUD.oxo2436-2457
      /code/branches/pickup/data/overlays/teamBaseMatchHUD.oxo8145-8555
      /code/branches/pickup2/data/overlays/teamBaseMatchHUD.oxo5942-6405
      /code/branches/pickup3/data/overlays/teamBaseMatchHUD.oxo6418-6523
      /code/branches/pickup4/data/overlays/teamBaseMatchHUD.oxo6594-6710
      /code/branches/pickups/data/overlays/teamBaseMatchHUD.oxo1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays/teamBaseMatchHUD.oxo2107-2497,​2915-3071
      /code/branches/png2/data/overlays/teamBaseMatchHUD.oxo7262-7263
      /code/branches/portals/data/overlays/teamBaseMatchHUD.oxo8087-8455
      /code/branches/portals2/data/overlays/teamBaseMatchHUD.oxo8460-8602
      /code/branches/ppspickups1/data/overlays/teamBaseMatchHUD.oxo6552-6708
      /code/branches/ppspickups2/data/overlays/teamBaseMatchHUD.oxo6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays/teamBaseMatchHUD.oxo6757-6997
      /code/branches/ppspickups4/data/overlays/teamBaseMatchHUD.oxo7003-7089
      /code/branches/presentation2/data/overlays/teamBaseMatchHUD.oxo6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays/teamBaseMatchHUD.oxo6913-7162
      /code/branches/questsystem/data/overlays/teamBaseMatchHUD.oxo1894-2088
      /code/branches/questsystem2/data/overlays/teamBaseMatchHUD.oxo2107-2259
      /code/branches/questsystem5/data/overlays/teamBaseMatchHUD.oxo2776-2905
      /code/branches/releasetodo/data/overlays/teamBaseMatchHUD.oxo7614-7647
      /code/branches/resource/data/overlays/teamBaseMatchHUD.oxo3327-3366
      /code/branches/resource2/data/overlays/teamBaseMatchHUD.oxo3372-5694
      /code/branches/rocket/data/overlays/teamBaseMatchHUD.oxo6523-6950
      /code/branches/rocket2/data/overlays/teamBaseMatchHUD.oxo6953-6970
      /code/branches/script_trigger/data/overlays/teamBaseMatchHUD.oxo1295-1953,​1955
      /code/branches/skybox2/data/overlays/teamBaseMatchHUD.oxo6559-6989
      /code/branches/sound/data/overlays/teamBaseMatchHUD.oxo2829-3010
      /code/branches/sound3/data/overlays/teamBaseMatchHUD.oxo5941-6102
      /code/branches/spaceboundaries/data/overlays/teamBaseMatchHUD.oxo8085-8457
      /code/branches/spaceboundaries2/data/overlays/teamBaseMatchHUD.oxo8460-8613
      /code/branches/spacerace/data/overlays/teamBaseMatchHUD.oxo8182-8630
      /code/branches/steering/data/overlays/teamBaseMatchHUD.oxo5949-6091,​8140-8595
      /code/branches/tetris/data/overlays/teamBaseMatchHUD.oxo8100-8563
      /code/branches/tutoriallevel/data/overlays/teamBaseMatchHUD.oxo7827-8370
      /code/branches/tutoriallevel2/data/overlays/teamBaseMatchHUD.oxo8370-8452
      /code/branches/tutoriallevel3/data/overlays/teamBaseMatchHUD.oxo8453-8636
      /code/branches/unity_build/data/overlays/teamBaseMatchHUD.oxo8440-8716
      /code/branches/weapon/data/overlays/teamBaseMatchHUD.oxo1925-2094
      /code/branches/weapon2/data/overlays/teamBaseMatchHUD.oxo2107-2488
      /code/branches/weapons/data/overlays/teamBaseMatchHUD.oxo2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays/teamBaseMatchHUD.oxo2742-2890

  • code/branches/presentation2012/data/overlays/underAttackHUD.oxo

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/dockingsystem2/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/environment3/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/formation/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/gamecontent/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/hud/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/masterserverfix/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/menue/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/newlevel2012/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/output/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/pickup2012/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/presentation/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/presentation2011/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/shipSelection/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/sound2012/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/spacegate/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/spaceraceTwo/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/surfaceRace/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/usability/data/overlays/underAttackHUD.oxomergedeligible
      /code/trunk/data/overlays/underAttackHUD.oxomergedeligible
      /code/branches/ai/data/overlays/underAttackHUD.oxo6592-7033
      /code/branches/ai2/data/overlays/underAttackHUD.oxo8721-8880
      /code/branches/bigships/data/overlays/underAttackHUD.oxo8137-8588
      /code/branches/buildsystem/data/overlays/underAttackHUD.oxo1874-2276,​2278-2400
      /code/branches/buildsystem2/data/overlays/underAttackHUD.oxo2506-2658
      /code/branches/buildsystem3/data/overlays/underAttackHUD.oxo2662-2708
      /code/branches/ceguilua/data/overlays/underAttackHUD.oxo1802-1808
      /code/branches/chat/data/overlays/underAttackHUD.oxo6527-6797
      /code/branches/chat2/data/overlays/underAttackHUD.oxo6836-6910
      /code/branches/console/data/overlays/underAttackHUD.oxo5941-6104
      /code/branches/consolecommands2/data/overlays/underAttackHUD.oxo6451-7178
      /code/branches/consolecommands3/data/overlays/underAttackHUD.oxo7178-7283
      /code/branches/core3/data/overlays/underAttackHUD.oxo1572-1739
      /code/branches/core4/data/overlays/underAttackHUD.oxo3221-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/overlays/underAttackHUD.oxo5768-5928,​6009
      /code/branches/data_cleanup/data/overlays/underAttackHUD.oxo7537-7686
      /code/branches/doc/data/overlays/underAttackHUD.oxo7290-7400
      /code/branches/dockingsystem/data/overlays/underAttackHUD.oxo8101-8192
      /code/branches/dynamicmatch/data/overlays/underAttackHUD.oxo6584-7030
      /code/branches/fps/data/overlays/underAttackHUD.oxo6591-7072
      /code/branches/gameimmersion/data/overlays/underAttackHUD.oxo8102-8577
      /code/branches/gamestate/data/overlays/underAttackHUD.oxo6430-6572,​6621-6661
      /code/branches/gamestates2/data/overlays/underAttackHUD.oxo6594-6745
      /code/branches/gametypes/data/overlays/underAttackHUD.oxo2826-3031
      /code/branches/gcc43/data/overlays/underAttackHUD.oxo1580
      /code/branches/gui/data/overlays/underAttackHUD.oxo1635-1723,​2795-2894
      /code/branches/hudelements/data/overlays/underAttackHUD.oxo6584-6941
      /code/branches/hudimprovements/data/overlays/underAttackHUD.oxo7920-8672
      /code/branches/ingamemenu/data/overlays/underAttackHUD.oxo6000-6023
      /code/branches/input/data/overlays/underAttackHUD.oxo1629-1636
      /code/branches/ipv6/data/overlays/underAttackHUD.oxo7293-7458
      /code/branches/kicklib/data/overlays/underAttackHUD.oxo7940-8096,​8098-8277
      /code/branches/kicklib2/data/overlays/underAttackHUD.oxo8282-8350
      /code/branches/lastmanstanding/data/overlays/underAttackHUD.oxo7479-7644
      /code/branches/lastmanstanding3/data/overlays/underAttackHUD.oxo7903-8175
      /code/branches/libraries/data/overlays/underAttackHUD.oxo5612-5692
      /code/branches/libraries2/data/overlays/underAttackHUD.oxo5703-5737
      /code/branches/lod/data/overlays/underAttackHUD.oxo6586-6911
      /code/branches/lodfinal/data/overlays/underAttackHUD.oxo2372-2411
      /code/branches/mac_osx/data/overlays/underAttackHUD.oxo7789-8128,​8135
      /code/branches/map/data/overlays/underAttackHUD.oxo2801-3086,​3089
      /code/branches/masterserver/data/overlays/underAttackHUD.oxo7502-7738
      /code/branches/menu/data/overlays/underAttackHUD.oxo5941-6146,​6148,​7536-7687
      /code/branches/miniprojects/data/overlays/underAttackHUD.oxo2754-2824
      /code/branches/netp2/data/overlays/underAttackHUD.oxo2835-2988
      /code/branches/netp3/data/overlays/underAttackHUD.oxo2988-3082
      /code/branches/netp6/data/overlays/underAttackHUD.oxo3214-3302
      /code/branches/network/data/overlays/underAttackHUD.oxo2356
      /code/branches/network2/data/overlays/underAttackHUD.oxo6434-6465
      /code/branches/network3/data/overlays/underAttackHUD.oxo7196-7344
      /code/branches/network4/data/overlays/underAttackHUD.oxo7497-7755
      /code/branches/network5/data/overlays/underAttackHUD.oxo7757-7781
      /code/branches/network6/data/overlays/underAttackHUD.oxo7823-8315
      /code/branches/network64/data/overlays/underAttackHUD.oxo2210-2355
      /code/branches/notifications/data/overlays/underAttackHUD.oxo7314-7401
      /code/branches/objecthierarchy/data/overlays/underAttackHUD.oxo1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/data/overlays/underAttackHUD.oxo2171-2479
      /code/branches/ois_update/data/overlays/underAttackHUD.oxo7506-7788
      /code/branches/overlay/data/overlays/underAttackHUD.oxo2117-2385
      /code/branches/particles/data/overlays/underAttackHUD.oxo2829-3085
      /code/branches/particles2/data/overlays/underAttackHUD.oxo6050-6106,​6109
      /code/branches/pch/data/overlays/underAttackHUD.oxo3113-3194
      /code/branches/physics/data/overlays/underAttackHUD.oxo1912-2055,​2107-2439
      /code/branches/physics_merge/data/overlays/underAttackHUD.oxo2436-2457
      /code/branches/pickup/data/overlays/underAttackHUD.oxo8145-8555
      /code/branches/pickup2/data/overlays/underAttackHUD.oxo5942-6405
      /code/branches/pickup3/data/overlays/underAttackHUD.oxo6418-6523
      /code/branches/pickup4/data/overlays/underAttackHUD.oxo6594-6710
      /code/branches/pickups/data/overlays/underAttackHUD.oxo1926-2086,​2127,​2827-2915
      /code/branches/pickups2/data/overlays/underAttackHUD.oxo2107-2497,​2915-3071
      /code/branches/png2/data/overlays/underAttackHUD.oxo7262-7263
      /code/branches/portals/data/overlays/underAttackHUD.oxo8087-8455
      /code/branches/portals2/data/overlays/underAttackHUD.oxo8460-8602
      /code/branches/ppspickups1/data/overlays/underAttackHUD.oxo6552-6708
      /code/branches/ppspickups2/data/overlays/underAttackHUD.oxo6527-6532,​6554-6709
      /code/branches/ppspickups3/data/overlays/underAttackHUD.oxo6757-6997
      /code/branches/ppspickups4/data/overlays/underAttackHUD.oxo7003-7089
      /code/branches/presentation2/data/overlays/underAttackHUD.oxo6106-6416,​7787-7800
      /code/branches/presentation3/data/overlays/underAttackHUD.oxo6913-7162
      /code/branches/questsystem/data/overlays/underAttackHUD.oxo1894-2088
      /code/branches/questsystem2/data/overlays/underAttackHUD.oxo2107-2259
      /code/branches/questsystem5/data/overlays/underAttackHUD.oxo2776-2905
      /code/branches/releasetodo/data/overlays/underAttackHUD.oxo7614-7647
      /code/branches/resource/data/overlays/underAttackHUD.oxo3327-3366
      /code/branches/resource2/data/overlays/underAttackHUD.oxo3372-5694
      /code/branches/rocket/data/overlays/underAttackHUD.oxo6523-6950
      /code/branches/rocket2/data/overlays/underAttackHUD.oxo6953-6970
      /code/branches/script_trigger/data/overlays/underAttackHUD.oxo1295-1953,​1955
      /code/branches/skybox2/data/overlays/underAttackHUD.oxo6559-6989
      /code/branches/sound/data/overlays/underAttackHUD.oxo2829-3010
      /code/branches/sound3/data/overlays/underAttackHUD.oxo5941-6102
      /code/branches/spaceboundaries/data/overlays/underAttackHUD.oxo8085-8457
      /code/branches/spaceboundaries2/data/overlays/underAttackHUD.oxo8460-8613
      /code/branches/spacerace/data/overlays/underAttackHUD.oxo8182-8630
      /code/branches/steering/data/overlays/underAttackHUD.oxo5949-6091,​8140-8595
      /code/branches/tetris/data/overlays/underAttackHUD.oxo8100-8563
      /code/branches/tutoriallevel/data/overlays/underAttackHUD.oxo7827-8370
      /code/branches/tutoriallevel2/data/overlays/underAttackHUD.oxo8370-8452
      /code/branches/tutoriallevel3/data/overlays/underAttackHUD.oxo8453-8636
      /code/branches/unity_build/data/overlays/underAttackHUD.oxo8440-8716
      /code/branches/weapon/data/overlays/underAttackHUD.oxo1925-2094
      /code/branches/weapon2/data/overlays/underAttackHUD.oxo2107-2488
      /code/branches/weapons/data/overlays/underAttackHUD.oxo2897-3051,​8143-8591
      /code/branches/weaponsystem/data/overlays/underAttackHUD.oxo2742-2890
Note: See TracChangeset for help on using the changeset viewer.