Context Navigation

← Previous Change
Next Change →

data

Timestamp:

May 24, 2012, 8:49:19 PM (13 years ago)

Author:

decapitb

Message:

tower defense update

Location:

code/branches/presentation2012

Files:

: 96 edited

. (modified) (1 prop)
data (modified) (1 prop)
data/levels (modified) (1 prop)
data/levels/FPSTest.oxw (modified) (1 prop)
data/levels/Spacerace2.oxw (modified) (1 prop)
data/levels/asteroidField.oxw (modified) (1 prop)
data/levels/asteroids.oxw (modified) (1 prop)
data/levels/docking.oxw (modified) (1 prop)
data/levels/dynamicMatch.oxw (modified) (1 prop)
data/levels/earth.oxw (modified) (1 prop)
data/levels/emptyLevel.oxw (modified) (2 diffs, 1 prop)
data/levels/events.oxw (modified) (1 prop)
data/levels/fightInOurBack.oxw (modified) (1 prop)
data/levels/includes (modified) (1 prop)
data/levels/includes/CuboidSpaceStation.lua (modified) (1 prop)
data/levels/includes/asteroidField.lua (modified) (1 prop)
data/levels/includes/notifications.oxi (modified) (1 prop)
data/levels/includes/pickups.oxi (modified) (1 prop)
data/levels/includes/weaponSettingsAssff.oxi (modified) (1 prop)
data/levels/includes/weaponSettingsAssff2.oxi (modified) (1 prop)
data/levels/includes/weaponSettingsFPS.oxi (modified) (1 prop)
data/levels/includes/weaponSettingsGhost.oxi (modified) (1 prop)
data/levels/includes/weaponSettingsH2.oxi (modified) (1 prop)
data/levels/includes/weaponSettingsHXY.oxi (modified) (1 prop)
data/levels/includes/weaponSettingsImmTest.oxi (modified) (1 prop)
data/levels/includes/weaponSettingsPirate.oxi (modified) (1 prop)
data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) (1 prop)
data/levels/includes/weaponSettingsSwallow.oxi (modified) (1 prop)
data/levels/includes/weaponSettingsTransporter.oxi (modified) (1 prop)
data/levels/lastManStanding.oxw (modified) (1 prop)
data/levels/lastTeamStanding.oxw (modified) (1 prop)
data/levels/lastTeamStandingII.oxw (modified) (1 prop)
data/levels/missionOne.oxw (modified) (1 prop)
data/levels/myTestLevel.oxw (modified) (1 prop)
data/levels/notifications.oxw (modified) (1 prop)
data/levels/old (modified) (1 prop)
data/levels/pickups.oxw (modified) (1 prop)
data/levels/pirateAttack.oxw (modified) (1 prop)
data/levels/planets.oxw (modified) (1 prop)
data/levels/pong.oxw (modified) (1 prop)
data/levels/portals.oxw (modified) (1 prop)
data/levels/presentation.oxw (modified) (1 prop)
data/levels/presentation09.oxw (modified) (1 prop)
data/levels/presentation09b.oxw (modified) (1 prop)
data/levels/presentationDM.oxw (modified) (1 prop)
data/levels/presentationFS10.oxw (modified) (1 prop)
data/levels/presentationFS102.oxw (modified) (1 prop)
data/levels/presentationFS10Ed.oxw (modified) (1 prop)
data/levels/presentationFS11.oxw (modified) (1 prop)
data/levels/presentationHS09.oxw (modified) (1 prop)
data/levels/presentationHS09b.oxw (modified) (1 prop)
data/levels/presentationHS11.oxw (modified) (1 prop)
data/levels/princessAeryn.oxw (modified) (1 prop)
data/levels/quests.oxw (modified) (1 prop)
data/levels/screenshot.oxw (modified) (1 prop)
data/levels/shieldTest.oxw (modified) (1 prop)
data/levels/sound.oxw (modified) (1 prop)
data/levels/spaceRace.oxw (modified) (1 prop)
data/levels/surfaceRace.oxw (modified) (1 prop)
data/levels/teamBaseMatch.oxw (modified) (1 prop)
data/levels/teamDeathMatch.oxw (modified) (1 prop)
data/levels/templates (modified) (1 prop)
data/levels/templates/FPS.oxt (modified) (1 prop)
data/levels/templates/lodInformation.oxt (modified) (1 prop)
data/levels/templates/pickupRepresentationTemplates.oxt (modified) (1 prop)
data/levels/templates/spaceshipAssff.oxt (modified) (1 prop)
data/levels/templates/spaceshipAssff2.oxt (modified) (1 prop)
data/levels/templates/spaceshipGhost.oxt (modified) (1 prop)
data/levels/templates/spaceshipH2.oxt (modified) (1 prop)
data/levels/templates/spaceshipHXY.oxt (modified) (1 prop)
data/levels/templates/spaceshipHXYSL.oxt (modified) (1 prop)
data/levels/templates/spaceshipPirate.oxt (modified) (1 prop)
data/levels/templates/spaceshipRace.oxt (modified) (1 prop)
data/levels/templates/spaceshipSpacecruiser.oxt (modified) (1 prop)
data/levels/templates/spaceshipSwallow.oxt (modified) (1 prop)
data/levels/templates/spaceshipTransporter.oxt (modified) (1 prop)
data/levels/templates/spaceshipTransporterSL.oxt (modified) (1 prop)
data/levels/testStars.oxw (modified) (1 prop)
data/levels/testSwallow.oxw (modified) (1 prop)
data/levels/tetris.oxw (modified) (1 prop)
data/levels/theTimeMachine.oxw (modified) (1 prop)
data/levels/tutorial.oxw (modified) (1 prop)
data/levels/underAttack.oxw (modified) (1 prop)
data/levels/waypoints.oxw (modified) (1 prop)
data/overlays (modified) (1 prop)
data/overlays/HUD.oxo (modified) (1 prop)
data/overlays/HUDTemplates3.oxo (modified) (1 prop)
data/overlays/HUDTemplatesFPS.oxo (modified) (1 prop)
data/overlays/debug.oxo (modified) (1 prop)
data/overlays/dynamicMatchHUD.oxo (modified) (1 prop)
data/overlays/lastManStandingHUD.oxo (modified) (1 prop)
data/overlays/lastTeamStandingHUD.oxo (modified) (1 prop)
data/overlays/pongHUD.oxo (modified) (1 prop)
data/overlays/stats.oxo (modified) (1 prop)
data/overlays/teamBaseMatchHUD.oxo (modified) (1 prop)
data/overlays/underAttackHUD.oxo (modified) (1 prop)

Legend:

: Unmodified
: Added
: Removed

code/branches/presentation2012
- Property svn:mergeinfo changed
  /code/branches/newlevel2012 merged: 9236

code/branches/presentation2012/data

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data	merged	eligible
/code/branches/environment3/data	merged	eligible
/code/branches/formation/data	merged	eligible
/code/branches/gamecontent/data	merged	eligible
/code/branches/hud/data	merged	eligible
/code/branches/masterserverfix/data	merged	eligible
/code/branches/menue/data	merged	eligible
/code/branches/newlevel2012/data	merged	eligible
/code/branches/output/data	merged	eligible
/code/branches/pickup2012/data	merged	eligible
/code/branches/presentation/data	merged	eligible
/code/branches/presentation2011/data	merged	eligible
/code/branches/shipSelection/data	merged	eligible
/code/branches/sound2012/data	merged	eligible
/code/branches/spacegate/data	merged	eligible
/code/branches/spaceraceTwo/data	merged	eligible
/code/branches/surfaceRace/data	merged	eligible
/code/branches/usability/data	merged	eligible
/code/trunk/data	merged	eligible
/code/branches/ai/data	6592-7033
/code/branches/ai2/data	8721-8880
/code/branches/bigships/data	8137-8588
/code/branches/buildsystem/data	1874-2276,2278-2400
/code/branches/buildsystem2/data	2506-2658
/code/branches/buildsystem3/data	2662-2708
/code/branches/ceguilua/data	1802-1808
/code/branches/chat/data	6527-6797
/code/branches/chat2/data	6836-6910
/code/branches/console/data	5941-6104
/code/branches/consolecommands2/data	6451-7178
/code/branches/consolecommands3/data	7178-7283
/code/branches/core3/data	1572-1739
/code/branches/core4/data	3221-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	5768-5928,6009
/code/branches/data_cleanup/data	7537-7686
/code/branches/doc/data	7290-7400
/code/branches/dockingsystem/data	8101-8192
/code/branches/dynamicmatch/data	6584-7030
/code/branches/fps/data	6591-7072
/code/branches/gameimmersion/data	8102-8577
/code/branches/gamestate/data	6430-6572,6621-6661
/code/branches/gamestates2/data	6594-6745
/code/branches/gametypes/data	2826-3031
/code/branches/gcc43/data	1580
/code/branches/gui/data	1635-1723,2795-2894
/code/branches/hudelements/data	6584-6941
/code/branches/hudimprovements/data	7920-8672
/code/branches/ingamemenu/data	6000-6023
/code/branches/input/data	1629-1636
/code/branches/ipv6/data	7293-7458
/code/branches/kicklib/data	7940-8096,8098-8277
/code/branches/kicklib2/data	8282-8350
/code/branches/lastmanstanding/data	7479-7644
/code/branches/lastmanstanding3/data	7903-8175
/code/branches/libraries/data	5612-5692
/code/branches/libraries2/data	5703-5737
/code/branches/lod/data	6586-6911
/code/branches/lodfinal/data	2372-2411
/code/branches/mac_osx/data	7789-8128,8135
/code/branches/map/data	2801-3086,3089
/code/branches/masterserver/data	7502-7738
/code/branches/menu/data	5941-6146,6148,7536-7687
/code/branches/miniprojects/data	2754-2824
/code/branches/netp2/data	2835-2988
/code/branches/netp3/data	2988-3082
/code/branches/netp6/data	3214-3302
/code/branches/network/data	2356
/code/branches/network2/data	6434-6465
/code/branches/network3/data	7196-7344
/code/branches/network4/data	7497-7755
/code/branches/network5/data	7757-7781
/code/branches/network6/data	7823-8315
/code/branches/network64/data	2210-2355
/code/branches/notifications/data	7314-7401
/code/branches/objecthierarchy/data	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data	2171-2479
/code/branches/ois_update/data	7506-7788
/code/branches/overlay/data	2117-2385
/code/branches/particles/data	2829-3085
/code/branches/particles2/data	6050-6106,6109
/code/branches/pch/data	3113-3194
/code/branches/physics/data	1912-2055,2107-2439
/code/branches/physics_merge/data	2436-2457
/code/branches/pickup/data	8145-8555
/code/branches/pickup2/data	5942-6405
/code/branches/pickup3/data	6418-6523
/code/branches/pickup4/data	6594-6710
/code/branches/pickups/data	1926-2086,2127,2827-2915
/code/branches/pickups2/data	2107-2497,2915-3071
/code/branches/png2/data	7262-7263
/code/branches/portals/data	8087-8455
/code/branches/portals2/data	8460-8602
/code/branches/ppspickups1/data	6552-6708
/code/branches/ppspickups2/data	6527-6532,6554-6709
/code/branches/ppspickups3/data	6757-6997
/code/branches/ppspickups4/data	7003-7089
/code/branches/presentation2/data	6106-6416,7787-7800
/code/branches/presentation3/data	6913-7162
/code/branches/questsystem/data	1894-2088
/code/branches/questsystem2/data	2107-2259
/code/branches/questsystem5/data	2776-2905
/code/branches/releasetodo/data	7614-7647
/code/branches/resource/data	3327-3366
/code/branches/resource2/data	3372-5694
/code/branches/rocket/data	6523-6950
/code/branches/rocket2/data	6953-6970
/code/branches/script_trigger/data	1295-1953,1955
/code/branches/skybox2/data	6559-6989
/code/branches/sound/data	2829-3010
/code/branches/sound3/data	5941-6102
/code/branches/spaceboundaries/data	8085-8457
/code/branches/spaceboundaries2/data	8460-8613
/code/branches/spacerace/data	8182-8630
/code/branches/steering/data	5949-6091,8140-8595
/code/branches/tetris/data	8100-8563
/code/branches/tutoriallevel/data	7827-8370
/code/branches/tutoriallevel2/data	8370-8452
/code/branches/tutoriallevel3/data	8453-8636
/code/branches/unity_build/data	8440-8716
/code/branches/weapon/data	1925-2094
/code/branches/weapon2/data	2107-2488
/code/branches/weapons/data	2897-3051,8143-8591
/code/branches/weaponsystem/data	2742-2890

code/branches/presentation2012/data/levels

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels	merged	eligible
/code/branches/environment3/data/levels	merged	eligible
/code/branches/formation/data/levels	merged	eligible
/code/branches/gamecontent/data/levels	merged	eligible
/code/branches/hud/data/levels	merged	eligible
/code/branches/masterserverfix/data/levels	merged	eligible
/code/branches/menue/data/levels	merged	eligible
/code/branches/newlevel2012/data/levels	merged	eligible
/code/branches/output/data/levels	merged	eligible
/code/branches/pickup2012/data/levels	merged	eligible
/code/branches/presentation/data/levels	merged	eligible
/code/branches/presentation2011/data/levels	merged	eligible
/code/branches/shipSelection/data/levels	merged	eligible
/code/branches/sound2012/data/levels	merged	non-inheritable	eligible
/code/branches/spacegate/data/levels	merged	eligible
/code/branches/spaceraceTwo/data/levels	merged	eligible
/code/branches/surfaceRace/data/levels	merged	eligible
/code/branches/usability/data/levels	merged	eligible
/code/trunk/data/levels	merged	eligible
/code/branches/ai/data/levels	6592-7033
/code/branches/ai2/data/levels	8721-8880
/code/branches/bigships/data/levels	8137-8588
/code/branches/buildsystem/data/levels	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels	2506-2658
/code/branches/buildsystem3/data/levels	2662-2708
/code/branches/ceguilua/data/levels	1802-1808
/code/branches/chat/data/levels	6527-6797
/code/branches/chat2/data/levels	6836-6910
/code/branches/console/data/levels	5941-6104
/code/branches/consolecommands2/data/levels	6451-7178
/code/branches/consolecommands3/data/levels	7178-7283
/code/branches/core3/data/levels	1572-1739
/code/branches/core4/data/levels	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels	5768-5928,6009
/code/branches/data_cleanup/data/levels	7537-7686
/code/branches/doc/data/levels	7290-7400
/code/branches/dockingsystem/data/levels	8101-8192
/code/branches/dynamicmatch/data/levels	6584-7030
/code/branches/fps/data/levels	6591-7072
/code/branches/gameimmersion/data/levels	8102-8577
/code/branches/gamestate/data/levels	6430-6572,6621-6661
/code/branches/gamestates2/data/levels	6594-6745
/code/branches/gametypes/data/levels	2826-3031
/code/branches/gcc43/data/levels	1580
/code/branches/gui/data/levels	1635-1723,2795-2894
/code/branches/hudelements/data/levels	6584-6941
/code/branches/hudimprovements/data/levels	7920-8672
/code/branches/ingamemenu/data/levels	6000-6023
/code/branches/input/data/levels	1629-1636
/code/branches/ipv6/data/levels	7293-7458
/code/branches/kicklib/data/levels	7940-8096,8098-8277
/code/branches/kicklib2/data/levels	8282-8350
/code/branches/lastmanstanding/data/levels	7479-7644
/code/branches/lastmanstanding3/data/levels	7903-8175
/code/branches/libraries/data/levels	5612-5692
/code/branches/libraries2/data/levels	5703-5737
/code/branches/lod/data/levels	6586-6911
/code/branches/lodfinal/data/levels	2372-2411
/code/branches/mac_osx/data/levels	7789-8128,8135
/code/branches/map/data/levels	2801-3086,3089
/code/branches/masterserver/data/levels	7502-7738
/code/branches/menu/data/levels	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels	2754-2824
/code/branches/netp2/data/levels	2835-2988
/code/branches/netp3/data/levels	2988-3082
/code/branches/netp6/data/levels	3214-3302
/code/branches/network/data/levels	2356
/code/branches/network2/data/levels	6434-6465
/code/branches/network3/data/levels	7196-7344
/code/branches/network4/data/levels	7497-7755
/code/branches/network5/data/levels	7757-7781
/code/branches/network6/data/levels	7823-8315
/code/branches/network64/data/levels	2210-2355
/code/branches/notifications/data/levels	7314-7401
/code/branches/objecthierarchy/data/levels	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels	2171-2479
/code/branches/ois_update/data/levels	7506-7788
/code/branches/overlay/data/levels	2117-2385
/code/branches/particles/data/levels	2829-3085
/code/branches/particles2/data/levels	6050-6106,6109
/code/branches/pch/data/levels	3113-3194
/code/branches/physics/data/levels	1912-2055,2107-2439
/code/branches/physics_merge/data/levels	2436-2457
/code/branches/pickup/data/levels	8145-8555
/code/branches/pickup2/data/levels	5942-6405
/code/branches/pickup3/data/levels	6418-6523
/code/branches/pickup4/data/levels	6594-6710
/code/branches/pickups/data/levels	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels	2107-2497,2915-3071
/code/branches/png2/data/levels	7262-7263
/code/branches/portals/data/levels	8087-8455
/code/branches/portals2/data/levels	8460-8602
/code/branches/ppspickups1/data/levels	6552-6708
/code/branches/ppspickups2/data/levels	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels	6757-6997
/code/branches/ppspickups4/data/levels	7003-7089
/code/branches/presentation2/data/levels	6106-6416,7787-7800
/code/branches/presentation3/data/levels	6913-7162
/code/branches/questsystem/data/levels	1894-2088
/code/branches/questsystem2/data/levels	2107-2259
/code/branches/questsystem5/data/levels	2776-2905
/code/branches/releasetodo/data/levels	7614-7647
/code/branches/resource/data/levels	3327-3366
/code/branches/resource2/data/levels	3372-5694
/code/branches/rocket/data/levels	6523-6950
/code/branches/rocket2/data/levels	6953-6970
/code/branches/script_trigger/data/levels	1295-1953,1955
/code/branches/skybox2/data/levels	6559-6989
/code/branches/sound/data/levels	2829-3010
/code/branches/sound3/data/levels	5941-6102
/code/branches/spaceboundaries/data/levels	8085-8457
/code/branches/spaceboundaries2/data/levels	8460-8613
/code/branches/spacerace/data/levels	8182-8630
/code/branches/steering/data/levels	5949-6091,8140-8595
/code/branches/tetris/data/levels	8100-8563
/code/branches/tutoriallevel/data/levels	7827-8370
/code/branches/tutoriallevel2/data/levels	8370-8452
/code/branches/tutoriallevel3/data/levels	8453-8636
/code/branches/unity_build/data/levels	8440-8716
/code/branches/weapon/data/levels	1925-2094
/code/branches/weapon2/data/levels	2107-2488
/code/branches/weapons/data/levels	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels	2742-2890

code/branches/presentation2012/data/levels/FPSTest.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/FPSTest.oxw	merged	eligible
/code/branches/environment3/data/levels/FPSTest.oxw	merged	eligible
/code/branches/formation/data/levels/FPSTest.oxw	merged	eligible
/code/branches/gamecontent/data/levels/FPSTest.oxw	merged	eligible
/code/branches/hud/data/levels/FPSTest.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/FPSTest.oxw	merged	eligible
/code/branches/menue/data/levels/FPSTest.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/FPSTest.oxw	merged	eligible
/code/branches/output/data/levels/FPSTest.oxw	merged	eligible
/code/branches/pickup2012/data/levels/FPSTest.oxw	merged	eligible
/code/branches/presentation/data/levels/FPSTest.oxw	merged	eligible
/code/branches/presentation2011/data/levels/FPSTest.oxw	merged	eligible
/code/branches/shipSelection/data/levels/FPSTest.oxw	merged	eligible
/code/branches/sound2012/data/levels/FPSTest.oxw	merged	eligible
/code/branches/spacegate/data/levels/FPSTest.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/FPSTest.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/FPSTest.oxw	merged	eligible
/code/branches/usability/data/levels/FPSTest.oxw	merged	eligible
/code/trunk/data/levels/FPSTest.oxw	merged	eligible
/code/branches/ai/data/levels/FPSTest.oxw	6592-7033
/code/branches/ai2/data/levels/FPSTest.oxw	8721-8880
/code/branches/bigships/data/levels/FPSTest.oxw	8137-8588
/code/branches/buildsystem/data/levels/FPSTest.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/FPSTest.oxw	2506-2658
/code/branches/buildsystem3/data/levels/FPSTest.oxw	2662-2708
/code/branches/ceguilua/data/levels/FPSTest.oxw	1802-1808
/code/branches/chat/data/levels/FPSTest.oxw	6527-6797
/code/branches/chat2/data/levels/FPSTest.oxw	6836-6910
/code/branches/console/data/levels/FPSTest.oxw	5941-6104
/code/branches/consolecommands2/data/levels/FPSTest.oxw	6451-7178
/code/branches/consolecommands3/data/levels/FPSTest.oxw	7178-7283
/code/branches/core3/data/levels/FPSTest.oxw	1572-1739
/code/branches/core4/data/levels/FPSTest.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/FPSTest.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/FPSTest.oxw	7537-7686
/code/branches/doc/data/levels/FPSTest.oxw	7290-7400
/code/branches/dockingsystem/data/levels/FPSTest.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/FPSTest.oxw	6584-7030
/code/branches/fps/data/levels/FPSTest.oxw	6591-7072
/code/branches/gameimmersion/data/levels/FPSTest.oxw	8102-8577
/code/branches/gamestate/data/levels/FPSTest.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/FPSTest.oxw	6594-6745
/code/branches/gametypes/data/levels/FPSTest.oxw	2826-3031
/code/branches/gcc43/data/levels/FPSTest.oxw	1580
/code/branches/gui/data/levels/FPSTest.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/FPSTest.oxw	6584-6941
/code/branches/hudimprovements/data/levels/FPSTest.oxw	7920-8672
/code/branches/ingamemenu/data/levels/FPSTest.oxw	6000-6023
/code/branches/input/data/levels/FPSTest.oxw	1629-1636
/code/branches/ipv6/data/levels/FPSTest.oxw	7293-7458
/code/branches/kicklib/data/levels/FPSTest.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/FPSTest.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/FPSTest.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/FPSTest.oxw	7903-8175
/code/branches/libraries/data/levels/FPSTest.oxw	5612-5692
/code/branches/libraries2/data/levels/FPSTest.oxw	5703-5737
/code/branches/lod/data/levels/FPSTest.oxw	6586-6911
/code/branches/lodfinal/data/levels/FPSTest.oxw	2372-2411
/code/branches/mac_osx/data/levels/FPSTest.oxw	7789-8128,8135
/code/branches/map/data/levels/FPSTest.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/FPSTest.oxw	7502-7738
/code/branches/menu/data/levels/FPSTest.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/FPSTest.oxw	2754-2824
/code/branches/netp2/data/levels/FPSTest.oxw	2835-2988
/code/branches/netp3/data/levels/FPSTest.oxw	2988-3082
/code/branches/netp6/data/levels/FPSTest.oxw	3214-3302
/code/branches/network/data/levels/FPSTest.oxw	2356
/code/branches/network2/data/levels/FPSTest.oxw	6434-6465
/code/branches/network3/data/levels/FPSTest.oxw	7196-7344
/code/branches/network4/data/levels/FPSTest.oxw	7497-7755
/code/branches/network5/data/levels/FPSTest.oxw	7757-7781
/code/branches/network6/data/levels/FPSTest.oxw	7823-8315
/code/branches/network64/data/levels/FPSTest.oxw	2210-2355
/code/branches/notifications/data/levels/FPSTest.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/FPSTest.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/FPSTest.oxw	2171-2479
/code/branches/ois_update/data/levels/FPSTest.oxw	7506-7788
/code/branches/overlay/data/levels/FPSTest.oxw	2117-2385
/code/branches/particles/data/levels/FPSTest.oxw	2829-3085
/code/branches/particles2/data/levels/FPSTest.oxw	6050-6106,6109
/code/branches/pch/data/levels/FPSTest.oxw	3113-3194
/code/branches/physics/data/levels/FPSTest.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/FPSTest.oxw	2436-2457
/code/branches/pickup/data/levels/FPSTest.oxw	8145-8555
/code/branches/pickup2/data/levels/FPSTest.oxw	5942-6405
/code/branches/pickup3/data/levels/FPSTest.oxw	6418-6523
/code/branches/pickup4/data/levels/FPSTest.oxw	6594-6710
/code/branches/pickups/data/levels/FPSTest.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/FPSTest.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/FPSTest.oxw	7262-7263
/code/branches/portals/data/levels/FPSTest.oxw	8087-8455
/code/branches/portals2/data/levels/FPSTest.oxw	8460-8602
/code/branches/ppspickups1/data/levels/FPSTest.oxw	6552-6708
/code/branches/ppspickups2/data/levels/FPSTest.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/FPSTest.oxw	6757-6997
/code/branches/ppspickups4/data/levels/FPSTest.oxw	7003-7089
/code/branches/presentation2/data/levels/FPSTest.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/FPSTest.oxw	6913-7162
/code/branches/questsystem/data/levels/FPSTest.oxw	1894-2088
/code/branches/questsystem2/data/levels/FPSTest.oxw	2107-2259
/code/branches/questsystem5/data/levels/FPSTest.oxw	2776-2905
/code/branches/releasetodo/data/levels/FPSTest.oxw	7614-7647
/code/branches/resource/data/levels/FPSTest.oxw	3327-3366
/code/branches/resource2/data/levels/FPSTest.oxw	3372-5694
/code/branches/rocket/data/levels/FPSTest.oxw	6523-6950
/code/branches/rocket2/data/levels/FPSTest.oxw	6953-6970
/code/branches/script_trigger/data/levels/FPSTest.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/FPSTest.oxw	6559-6989
/code/branches/sound/data/levels/FPSTest.oxw	2829-3010
/code/branches/sound3/data/levels/FPSTest.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/FPSTest.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/FPSTest.oxw	8460-8613
/code/branches/spacerace/data/levels/FPSTest.oxw	8182-8630
/code/branches/steering/data/levels/FPSTest.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/FPSTest.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/FPSTest.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/FPSTest.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/FPSTest.oxw	8453-8636
/code/branches/unity_build/data/levels/FPSTest.oxw	8440-8716
/code/branches/weapon/data/levels/FPSTest.oxw	1925-2094
/code/branches/weapon2/data/levels/FPSTest.oxw	2107-2488
/code/branches/weapons/data/levels/FPSTest.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/FPSTest.oxw	2742-2890

code/branches/presentation2012/data/levels/Spacerace2.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/newlevel2012/data/levels/Spacerace2.oxw	merged	eligible
/code/branches/pickup2012/data/levels/Spacerace2.oxw	merged	eligible
/code/branches/presentation2011/data/levels/Spacerace2.oxw	merged	eligible
/code/branches/shipSelection/data/levels/Spacerace2.oxw	merged	eligible
/code/branches/sound2012/data/levels/Spacerace2.oxw	merged	eligible
/code/branches/spacegate/data/levels/Spacerace2.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/Spacerace2.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/Spacerace2.oxw	merged	eligible
/code/trunk/data/levels/Spacerace2.oxw	merged	eligible
/code/branches/ai/data/levels/Spacerace2.oxw	6592-7033
/code/branches/ai2/data/levels/Spacerace2.oxw	8721-8880
/code/branches/bigships/data/levels/Spacerace2.oxw	8137-8588
/code/branches/buildsystem/data/levels/Spacerace2.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/Spacerace2.oxw	2506-2658
/code/branches/buildsystem3/data/levels/Spacerace2.oxw	2662-2708
/code/branches/ceguilua/data/levels/Spacerace2.oxw	1802-1808
/code/branches/chat/data/levels/Spacerace2.oxw	6527-6797
/code/branches/chat2/data/levels/Spacerace2.oxw	6836-6910
/code/branches/console/data/levels/Spacerace2.oxw	5941-6104
/code/branches/consolecommands2/data/levels/Spacerace2.oxw	6451-7178
/code/branches/consolecommands3/data/levels/Spacerace2.oxw	7178-7283
/code/branches/core3/data/levels/Spacerace2.oxw	1572-1739
/code/branches/core4/data/levels/Spacerace2.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/Spacerace2.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/Spacerace2.oxw	7537-7686
/code/branches/doc/data/levels/Spacerace2.oxw	7290-7400
/code/branches/dockingsystem/data/levels/Spacerace2.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/Spacerace2.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/Spacerace2.oxw	6584-7030
/code/branches/environment3/data/levels/Spacerace2.oxw	8887-8975
/code/branches/formation/data/levels/Spacerace2.oxw	8885-8991
/code/branches/fps/data/levels/Spacerace2.oxw	6591-7072
/code/branches/gamecontent/data/levels/Spacerace2.oxw	8893-8968
/code/branches/gameimmersion/data/levels/Spacerace2.oxw	8102-8577
/code/branches/gamestate/data/levels/Spacerace2.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/Spacerace2.oxw	6594-6745
/code/branches/gametypes/data/levels/Spacerace2.oxw	2826-3031
/code/branches/gcc43/data/levels/Spacerace2.oxw	1580
/code/branches/gui/data/levels/Spacerace2.oxw	1635-1723,2795-2894
/code/branches/hud/data/levels/Spacerace2.oxw	8883-8986
/code/branches/hudelements/data/levels/Spacerace2.oxw	6584-6941
/code/branches/hudimprovements/data/levels/Spacerace2.oxw	7920-8672
/code/branches/ingamemenu/data/levels/Spacerace2.oxw	6000-6023
/code/branches/input/data/levels/Spacerace2.oxw	1629-1636
/code/branches/ipv6/data/levels/Spacerace2.oxw	7293-7458
/code/branches/kicklib/data/levels/Spacerace2.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/Spacerace2.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/Spacerace2.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/Spacerace2.oxw	7903-8175
/code/branches/libraries/data/levels/Spacerace2.oxw	5612-5692
/code/branches/libraries2/data/levels/Spacerace2.oxw	5703-5737
/code/branches/lod/data/levels/Spacerace2.oxw	6586-6911
/code/branches/lodfinal/data/levels/Spacerace2.oxw	2372-2411
/code/branches/mac_osx/data/levels/Spacerace2.oxw	7789-8128,8135
/code/branches/map/data/levels/Spacerace2.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/Spacerace2.oxw	7502-7738
/code/branches/masterserverfix/data/levels/Spacerace2.oxw	8933-8936
/code/branches/menu/data/levels/Spacerace2.oxw	5941-6146,6148,7536-7687
/code/branches/menue/data/levels/Spacerace2.oxw	8884-8976
/code/branches/miniprojects/data/levels/Spacerace2.oxw	2754-2824
/code/branches/netp2/data/levels/Spacerace2.oxw	2835-2988
/code/branches/netp3/data/levels/Spacerace2.oxw	2988-3082
/code/branches/netp6/data/levels/Spacerace2.oxw	3214-3302
/code/branches/network/data/levels/Spacerace2.oxw	2356
/code/branches/network2/data/levels/Spacerace2.oxw	6434-6465
/code/branches/network3/data/levels/Spacerace2.oxw	7196-7344
/code/branches/network4/data/levels/Spacerace2.oxw	7497-7755
/code/branches/network5/data/levels/Spacerace2.oxw	7757-7781
/code/branches/network6/data/levels/Spacerace2.oxw	7823-8315
/code/branches/network64/data/levels/Spacerace2.oxw	2210-2355
/code/branches/notifications/data/levels/Spacerace2.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/Spacerace2.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/Spacerace2.oxw	2171-2479
/code/branches/ois_update/data/levels/Spacerace2.oxw	7506-7788
/code/branches/output/data/levels/Spacerace2.oxw	8739-8857
/code/branches/overlay/data/levels/Spacerace2.oxw	2117-2385
/code/branches/particles/data/levels/Spacerace2.oxw	2829-3085
/code/branches/particles2/data/levels/Spacerace2.oxw	6050-6106,6109
/code/branches/pch/data/levels/Spacerace2.oxw	3113-3194
/code/branches/physics/data/levels/Spacerace2.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/Spacerace2.oxw	2436-2457
/code/branches/pickup/data/levels/Spacerace2.oxw	8145-8555
/code/branches/pickup2/data/levels/Spacerace2.oxw	5942-6405
/code/branches/pickup3/data/levels/Spacerace2.oxw	6418-6523
/code/branches/pickup4/data/levels/Spacerace2.oxw	6594-6710
/code/branches/pickups/data/levels/Spacerace2.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/Spacerace2.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/Spacerace2.oxw	7262-7263
/code/branches/portals/data/levels/Spacerace2.oxw	8087-8455
/code/branches/portals2/data/levels/Spacerace2.oxw	8460-8602
/code/branches/ppspickups1/data/levels/Spacerace2.oxw	6552-6708
/code/branches/ppspickups2/data/levels/Spacerace2.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/Spacerace2.oxw	6757-6997
/code/branches/ppspickups4/data/levels/Spacerace2.oxw	7003-7089
/code/branches/presentation/data/levels/Spacerace2.oxw	2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/Spacerace2.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/Spacerace2.oxw	6913-7162
/code/branches/questsystem/data/levels/Spacerace2.oxw	1894-2088
/code/branches/questsystem2/data/levels/Spacerace2.oxw	2107-2259
/code/branches/questsystem5/data/levels/Spacerace2.oxw	2776-2905
/code/branches/releasetodo/data/levels/Spacerace2.oxw	7614-7647
/code/branches/resource/data/levels/Spacerace2.oxw	3327-3366
/code/branches/resource2/data/levels/Spacerace2.oxw	3372-5694
/code/branches/rocket/data/levels/Spacerace2.oxw	6523-6950
/code/branches/rocket2/data/levels/Spacerace2.oxw	6953-6970
/code/branches/script_trigger/data/levels/Spacerace2.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/Spacerace2.oxw	6559-6989
/code/branches/sound/data/levels/Spacerace2.oxw	2829-3010
/code/branches/sound3/data/levels/Spacerace2.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/Spacerace2.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/Spacerace2.oxw	8460-8613
/code/branches/spacerace/data/levels/Spacerace2.oxw	8182-8630
/code/branches/steering/data/levels/Spacerace2.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/Spacerace2.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/Spacerace2.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/Spacerace2.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/Spacerace2.oxw	8453-8636
/code/branches/unity_build/data/levels/Spacerace2.oxw	8440-8716
/code/branches/usability/data/levels/Spacerace2.oxw	7915-8078
/code/branches/weapon/data/levels/Spacerace2.oxw	1925-2094
/code/branches/weapon2/data/levels/Spacerace2.oxw	2107-2488
/code/branches/weapons/data/levels/Spacerace2.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/Spacerace2.oxw	2742-2890

code/branches/presentation2012/data/levels/asteroidField.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/asteroidField.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/asteroidField.oxw	merged	eligible
/code/branches/pickup2012/data/levels/asteroidField.oxw	merged	eligible
/code/branches/presentation2011/data/levels/asteroidField.oxw	merged	eligible
/code/branches/shipSelection/data/levels/asteroidField.oxw	merged	eligible
/code/branches/sound2012/data/levels/asteroidField.oxw	merged	eligible
/code/branches/spacegate/data/levels/asteroidField.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/asteroidField.oxw	merged	eligible
/code/trunk/data/levels/asteroidField.oxw	merged	eligible
/code/branches/ai/data/levels/asteroidField.oxw	6592-7033
/code/branches/ai2/data/levels/asteroidField.oxw	8721-8880
/code/branches/bigships/data/levels/asteroidField.oxw	8137-8588
/code/branches/buildsystem/data/levels/asteroidField.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/asteroidField.oxw	2506-2658
/code/branches/buildsystem3/data/levels/asteroidField.oxw	2662-2708
/code/branches/ceguilua/data/levels/asteroidField.oxw	1802-1808
/code/branches/chat/data/levels/asteroidField.oxw	6527-6797
/code/branches/chat2/data/levels/asteroidField.oxw	6836-6910
/code/branches/console/data/levels/asteroidField.oxw	5941-6104
/code/branches/consolecommands2/data/levels/asteroidField.oxw	6451-7178
/code/branches/consolecommands3/data/levels/asteroidField.oxw	7178-7283
/code/branches/core3/data/levels/asteroidField.oxw	1572-1739
/code/branches/core4/data/levels/asteroidField.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/asteroidField.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/asteroidField.oxw	7537-7686
/code/branches/doc/data/levels/asteroidField.oxw	7290-7400
/code/branches/dockingsystem/data/levels/asteroidField.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/asteroidField.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/asteroidField.oxw	6584-7030
/code/branches/formation/data/levels/asteroidField.oxw	8885-8991
/code/branches/fps/data/levels/asteroidField.oxw	6591-7072
/code/branches/gamecontent/data/levels/asteroidField.oxw	8893-8968
/code/branches/gameimmersion/data/levels/asteroidField.oxw	8102-8577
/code/branches/gamestate/data/levels/asteroidField.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/asteroidField.oxw	6594-6745
/code/branches/gametypes/data/levels/asteroidField.oxw	2826-3031
/code/branches/gcc43/data/levels/asteroidField.oxw	1580
/code/branches/gui/data/levels/asteroidField.oxw	1635-1723,2795-2894
/code/branches/hud/data/levels/asteroidField.oxw	8883-8986
/code/branches/hudelements/data/levels/asteroidField.oxw	6584-6941
/code/branches/hudimprovements/data/levels/asteroidField.oxw	7920-8672
/code/branches/ingamemenu/data/levels/asteroidField.oxw	6000-6023
/code/branches/input/data/levels/asteroidField.oxw	1629-1636
/code/branches/ipv6/data/levels/asteroidField.oxw	7293-7458
/code/branches/kicklib/data/levels/asteroidField.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/asteroidField.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/asteroidField.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/asteroidField.oxw	7903-8175
/code/branches/libraries/data/levels/asteroidField.oxw	5612-5692
/code/branches/libraries2/data/levels/asteroidField.oxw	5703-5737
/code/branches/lod/data/levels/asteroidField.oxw	6586-6911
/code/branches/lodfinal/data/levels/asteroidField.oxw	2372-2411
/code/branches/mac_osx/data/levels/asteroidField.oxw	7789-8128,8135
/code/branches/map/data/levels/asteroidField.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/asteroidField.oxw	7502-7738
/code/branches/masterserverfix/data/levels/asteroidField.oxw	8933-8936
/code/branches/menu/data/levels/asteroidField.oxw	5941-6146,6148,7536-7687
/code/branches/menue/data/levels/asteroidField.oxw	8884-8976
/code/branches/miniprojects/data/levels/asteroidField.oxw	2754-2824
/code/branches/netp2/data/levels/asteroidField.oxw	2835-2988
/code/branches/netp3/data/levels/asteroidField.oxw	2988-3082
/code/branches/netp6/data/levels/asteroidField.oxw	3214-3302
/code/branches/network/data/levels/asteroidField.oxw	2356
/code/branches/network2/data/levels/asteroidField.oxw	6434-6465
/code/branches/network3/data/levels/asteroidField.oxw	7196-7344
/code/branches/network4/data/levels/asteroidField.oxw	7497-7755
/code/branches/network5/data/levels/asteroidField.oxw	7757-7781
/code/branches/network6/data/levels/asteroidField.oxw	7823-8315
/code/branches/network64/data/levels/asteroidField.oxw	2210-2355
/code/branches/notifications/data/levels/asteroidField.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/asteroidField.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/asteroidField.oxw	2171-2479
/code/branches/ois_update/data/levels/asteroidField.oxw	7506-7788
/code/branches/output/data/levels/asteroidField.oxw	8739-8857
/code/branches/overlay/data/levels/asteroidField.oxw	2117-2385
/code/branches/particles/data/levels/asteroidField.oxw	2829-3085
/code/branches/particles2/data/levels/asteroidField.oxw	6050-6106,6109
/code/branches/pch/data/levels/asteroidField.oxw	3113-3194
/code/branches/physics/data/levels/asteroidField.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/asteroidField.oxw	2436-2457
/code/branches/pickup/data/levels/asteroidField.oxw	8145-8555
/code/branches/pickup2/data/levels/asteroidField.oxw	5942-6405
/code/branches/pickup3/data/levels/asteroidField.oxw	6418-6523
/code/branches/pickup4/data/levels/asteroidField.oxw	6594-6710
/code/branches/pickups/data/levels/asteroidField.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/asteroidField.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/asteroidField.oxw	7262-7263
/code/branches/portals/data/levels/asteroidField.oxw	8087-8455
/code/branches/portals2/data/levels/asteroidField.oxw	8460-8602
/code/branches/ppspickups1/data/levels/asteroidField.oxw	6552-6708
/code/branches/ppspickups2/data/levels/asteroidField.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/asteroidField.oxw	6757-6997
/code/branches/ppspickups4/data/levels/asteroidField.oxw	7003-7089
/code/branches/presentation/data/levels/asteroidField.oxw	2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/asteroidField.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/asteroidField.oxw	6913-7162
/code/branches/questsystem/data/levels/asteroidField.oxw	1894-2088
/code/branches/questsystem2/data/levels/asteroidField.oxw	2107-2259
/code/branches/questsystem5/data/levels/asteroidField.oxw	2776-2905
/code/branches/releasetodo/data/levels/asteroidField.oxw	7614-7647
/code/branches/resource/data/levels/asteroidField.oxw	3327-3366
/code/branches/resource2/data/levels/asteroidField.oxw	3372-5694
/code/branches/rocket/data/levels/asteroidField.oxw	6523-6950
/code/branches/rocket2/data/levels/asteroidField.oxw	6953-6970
/code/branches/script_trigger/data/levels/asteroidField.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/asteroidField.oxw	6559-6989
/code/branches/sound/data/levels/asteroidField.oxw	2829-3010
/code/branches/sound3/data/levels/asteroidField.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/asteroidField.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/asteroidField.oxw	8460-8613
/code/branches/spacerace/data/levels/asteroidField.oxw	8182-8630
/code/branches/spaceraceTwo/data/levels/asteroidField.oxw	8881-8996
/code/branches/steering/data/levels/asteroidField.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/asteroidField.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/asteroidField.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/asteroidField.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/asteroidField.oxw	8453-8636
/code/branches/unity_build/data/levels/asteroidField.oxw	8440-8716
/code/branches/usability/data/levels/asteroidField.oxw	7915-8078
/code/branches/weapon/data/levels/asteroidField.oxw	1925-2094
/code/branches/weapon2/data/levels/asteroidField.oxw	2107-2488
/code/branches/weapons/data/levels/asteroidField.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/asteroidField.oxw	2742-2890

code/branches/presentation2012/data/levels/asteroids.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/asteroids.oxw	merged	eligible
/code/branches/environment3/data/levels/asteroids.oxw	merged	eligible
/code/branches/formation/data/levels/asteroids.oxw	merged	eligible
/code/branches/gamecontent/data/levels/asteroids.oxw	merged	eligible
/code/branches/hud/data/levels/asteroids.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/asteroids.oxw	merged	eligible
/code/branches/menue/data/levels/asteroids.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/asteroids.oxw	merged	eligible
/code/branches/output/data/levels/asteroids.oxw	merged	eligible
/code/branches/pickup2012/data/levels/asteroids.oxw	merged	eligible
/code/branches/presentation/data/levels/asteroids.oxw	merged	eligible
/code/branches/presentation2011/data/levels/asteroids.oxw	merged	eligible
/code/branches/shipSelection/data/levels/asteroids.oxw	merged	eligible
/code/branches/sound2012/data/levels/asteroids.oxw	merged	eligible
/code/branches/spacegate/data/levels/asteroids.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/asteroids.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/asteroids.oxw	merged	eligible
/code/branches/usability/data/levels/asteroids.oxw	merged	eligible
/code/trunk/data/levels/asteroids.oxw	merged	eligible
/code/branches/ai/data/levels/asteroids.oxw	6592-7033
/code/branches/ai2/data/levels/asteroids.oxw	8721-8880
/code/branches/bigships/data/levels/asteroids.oxw	8137-8588
/code/branches/buildsystem/data/levels/asteroids.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/asteroids.oxw	2506-2658
/code/branches/buildsystem3/data/levels/asteroids.oxw	2662-2708
/code/branches/ceguilua/data/levels/asteroids.oxw	1802-1808
/code/branches/chat/data/levels/asteroids.oxw	6527-6797
/code/branches/chat2/data/levels/asteroids.oxw	6836-6910
/code/branches/console/data/levels/asteroids.oxw	5941-6104
/code/branches/consolecommands2/data/levels/asteroids.oxw	6451-7178
/code/branches/consolecommands3/data/levels/asteroids.oxw	7178-7283
/code/branches/core3/data/levels/asteroids.oxw	1572-1739
/code/branches/core4/data/levels/asteroids.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/asteroids.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/asteroids.oxw	7537-7686
/code/branches/doc/data/levels/asteroids.oxw	7290-7400
/code/branches/dockingsystem/data/levels/asteroids.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/asteroids.oxw	6584-7030
/code/branches/fps/data/levels/asteroids.oxw	6591-7072
/code/branches/gameimmersion/data/levels/asteroids.oxw	8102-8577
/code/branches/gamestate/data/levels/asteroids.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/asteroids.oxw	6594-6745
/code/branches/gametypes/data/levels/asteroids.oxw	2826-3031
/code/branches/gcc43/data/levels/asteroids.oxw	1580
/code/branches/gui/data/levels/asteroids.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/asteroids.oxw	6584-6941
/code/branches/hudimprovements/data/levels/asteroids.oxw	7920-8672
/code/branches/ingamemenu/data/levels/asteroids.oxw	6000-6023
/code/branches/input/data/levels/asteroids.oxw	1629-1636
/code/branches/ipv6/data/levels/asteroids.oxw	7293-7458
/code/branches/kicklib/data/levels/asteroids.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/asteroids.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/asteroids.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/asteroids.oxw	7903-8175
/code/branches/libraries/data/levels/asteroids.oxw	5612-5692
/code/branches/libraries2/data/levels/asteroids.oxw	5703-5737
/code/branches/lod/data/levels/asteroids.oxw	6586-6911
/code/branches/lodfinal/data/levels/asteroids.oxw	2372-2411
/code/branches/mac_osx/data/levels/asteroids.oxw	7789-8128,8135
/code/branches/map/data/levels/asteroids.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/asteroids.oxw	7502-7738
/code/branches/menu/data/levels/asteroids.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/asteroids.oxw	2754-2824
/code/branches/netp2/data/levels/asteroids.oxw	2835-2988
/code/branches/netp3/data/levels/asteroids.oxw	2988-3082
/code/branches/netp6/data/levels/asteroids.oxw	3214-3302
/code/branches/network/data/levels/asteroids.oxw	2356
/code/branches/network2/data/levels/asteroids.oxw	6434-6465
/code/branches/network3/data/levels/asteroids.oxw	7196-7344
/code/branches/network4/data/levels/asteroids.oxw	7497-7755
/code/branches/network5/data/levels/asteroids.oxw	7757-7781
/code/branches/network6/data/levels/asteroids.oxw	7823-8315
/code/branches/network64/data/levels/asteroids.oxw	2210-2355
/code/branches/notifications/data/levels/asteroids.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/asteroids.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/asteroids.oxw	2171-2479
/code/branches/ois_update/data/levels/asteroids.oxw	7506-7788
/code/branches/overlay/data/levels/asteroids.oxw	2117-2385
/code/branches/particles/data/levels/asteroids.oxw	2829-3085
/code/branches/particles2/data/levels/asteroids.oxw	6050-6106,6109
/code/branches/pch/data/levels/asteroids.oxw	3113-3194
/code/branches/physics/data/levels/asteroids.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/asteroids.oxw	2436-2457
/code/branches/pickup/data/levels/asteroids.oxw	8145-8555
/code/branches/pickup2/data/levels/asteroids.oxw	5942-6405
/code/branches/pickup3/data/levels/asteroids.oxw	6418-6523
/code/branches/pickup4/data/levels/asteroids.oxw	6594-6710
/code/branches/pickups/data/levels/asteroids.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/asteroids.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/asteroids.oxw	7262-7263
/code/branches/portals/data/levels/asteroids.oxw	8087-8455
/code/branches/portals2/data/levels/asteroids.oxw	8460-8602
/code/branches/ppspickups1/data/levels/asteroids.oxw	6552-6708
/code/branches/ppspickups2/data/levels/asteroids.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/asteroids.oxw	6757-6997
/code/branches/ppspickups4/data/levels/asteroids.oxw	7003-7089
/code/branches/presentation2/data/levels/asteroids.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/asteroids.oxw	6913-7162
/code/branches/questsystem/data/levels/asteroids.oxw	1894-2088
/code/branches/questsystem2/data/levels/asteroids.oxw	2107-2259
/code/branches/questsystem5/data/levels/asteroids.oxw	2776-2905
/code/branches/releasetodo/data/levels/asteroids.oxw	7614-7647
/code/branches/resource/data/levels/asteroids.oxw	3327-3366
/code/branches/resource2/data/levels/asteroids.oxw	3372-5694
/code/branches/rocket/data/levels/asteroids.oxw	6523-6950
/code/branches/rocket2/data/levels/asteroids.oxw	6953-6970
/code/branches/script_trigger/data/levels/asteroids.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/asteroids.oxw	6559-6989
/code/branches/sound/data/levels/asteroids.oxw	2829-3010
/code/branches/sound3/data/levels/asteroids.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/asteroids.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/asteroids.oxw	8460-8613
/code/branches/spacerace/data/levels/asteroids.oxw	8182-8630
/code/branches/steering/data/levels/asteroids.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/asteroids.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/asteroids.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/asteroids.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/asteroids.oxw	8453-8636
/code/branches/unity_build/data/levels/asteroids.oxw	8440-8716
/code/branches/weapon/data/levels/asteroids.oxw	1925-2094
/code/branches/weapon2/data/levels/asteroids.oxw	2107-2488
/code/branches/weapons/data/levels/asteroids.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/asteroids.oxw	2742-2890

code/branches/presentation2012/data/levels/docking.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/docking.oxw	merged	eligible
/code/branches/environment3/data/levels/docking.oxw	merged	eligible
/code/branches/formation/data/levels/docking.oxw	merged	eligible
/code/branches/gamecontent/data/levels/docking.oxw	merged	eligible
/code/branches/hud/data/levels/docking.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/docking.oxw	merged	eligible
/code/branches/menue/data/levels/docking.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/docking.oxw	merged	eligible
/code/branches/output/data/levels/docking.oxw	merged	eligible
/code/branches/pickup2012/data/levels/docking.oxw	merged	eligible
/code/branches/presentation/data/levels/docking.oxw	merged	eligible
/code/branches/presentation2011/data/levels/docking.oxw	merged	eligible
/code/branches/shipSelection/data/levels/docking.oxw	merged	eligible
/code/branches/sound2012/data/levels/docking.oxw	merged	eligible
/code/branches/spacegate/data/levels/docking.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/docking.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/docking.oxw	merged	eligible
/code/trunk/data/levels/docking.oxw	merged	eligible
/code/branches/ai/data/levels/docking.oxw	6592-7033
/code/branches/ai2/data/levels/docking.oxw	8721-8880
/code/branches/bigships/data/levels/docking.oxw	8137-8588
/code/branches/buildsystem/data/levels/docking.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/docking.oxw	2506-2658
/code/branches/buildsystem3/data/levels/docking.oxw	2662-2708
/code/branches/ceguilua/data/levels/docking.oxw	1802-1808
/code/branches/chat/data/levels/docking.oxw	6527-6797
/code/branches/chat2/data/levels/docking.oxw	6836-6910
/code/branches/console/data/levels/docking.oxw	5941-6104
/code/branches/consolecommands2/data/levels/docking.oxw	6451-7178
/code/branches/consolecommands3/data/levels/docking.oxw	7178-7283
/code/branches/core3/data/levels/docking.oxw	1572-1739
/code/branches/core4/data/levels/docking.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/docking.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/docking.oxw	7537-7686
/code/branches/doc/data/levels/docking.oxw	7290-7400
/code/branches/dockingsystem/data/levels/docking.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/docking.oxw	6584-7030
/code/branches/fps/data/levels/docking.oxw	6591-7072
/code/branches/gameimmersion/data/levels/docking.oxw	8102-8577
/code/branches/gamestate/data/levels/docking.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/docking.oxw	6594-6745
/code/branches/gametypes/data/levels/docking.oxw	2826-3031
/code/branches/gcc43/data/levels/docking.oxw	1580
/code/branches/gui/data/levels/docking.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/docking.oxw	6584-6941
/code/branches/hudimprovements/data/levels/docking.oxw	7920-8672
/code/branches/ingamemenu/data/levels/docking.oxw	6000-6023
/code/branches/input/data/levels/docking.oxw	1629-1636
/code/branches/ipv6/data/levels/docking.oxw	7293-7458
/code/branches/kicklib/data/levels/docking.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/docking.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/docking.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/docking.oxw	7903-8175
/code/branches/libraries/data/levels/docking.oxw	5612-5692
/code/branches/libraries2/data/levels/docking.oxw	5703-5737
/code/branches/lod/data/levels/docking.oxw	6586-6911
/code/branches/lodfinal/data/levels/docking.oxw	2372-2411
/code/branches/mac_osx/data/levels/docking.oxw	7789-8128,8135
/code/branches/map/data/levels/docking.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/docking.oxw	7502-7738
/code/branches/menu/data/levels/docking.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/docking.oxw	2754-2824
/code/branches/netp2/data/levels/docking.oxw	2835-2988
/code/branches/netp3/data/levels/docking.oxw	2988-3082
/code/branches/netp6/data/levels/docking.oxw	3214-3302
/code/branches/network/data/levels/docking.oxw	2356
/code/branches/network2/data/levels/docking.oxw	6434-6465
/code/branches/network3/data/levels/docking.oxw	7196-7344
/code/branches/network4/data/levels/docking.oxw	7497-7755
/code/branches/network5/data/levels/docking.oxw	7757-7781
/code/branches/network6/data/levels/docking.oxw	7823-8315
/code/branches/network64/data/levels/docking.oxw	2210-2355
/code/branches/notifications/data/levels/docking.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/docking.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/docking.oxw	2171-2479
/code/branches/ois_update/data/levels/docking.oxw	7506-7788
/code/branches/overlay/data/levels/docking.oxw	2117-2385
/code/branches/particles/data/levels/docking.oxw	2829-3085
/code/branches/particles2/data/levels/docking.oxw	6050-6106,6109
/code/branches/pch/data/levels/docking.oxw	3113-3194
/code/branches/physics/data/levels/docking.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/docking.oxw	2436-2457
/code/branches/pickup/data/levels/docking.oxw	8145-8555
/code/branches/pickup2/data/levels/docking.oxw	5942-6405
/code/branches/pickup3/data/levels/docking.oxw	6418-6523
/code/branches/pickup4/data/levels/docking.oxw	6594-6710
/code/branches/pickups/data/levels/docking.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/docking.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/docking.oxw	7262-7263
/code/branches/portals/data/levels/docking.oxw	8087-8455
/code/branches/portals2/data/levels/docking.oxw	8460-8602
/code/branches/ppspickups1/data/levels/docking.oxw	6552-6708
/code/branches/ppspickups2/data/levels/docking.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/docking.oxw	6757-6997
/code/branches/ppspickups4/data/levels/docking.oxw	7003-7089
/code/branches/presentation2/data/levels/docking.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/docking.oxw	6913-7162
/code/branches/questsystem/data/levels/docking.oxw	1894-2088
/code/branches/questsystem2/data/levels/docking.oxw	2107-2259
/code/branches/questsystem5/data/levels/docking.oxw	2776-2905
/code/branches/releasetodo/data/levels/docking.oxw	7614-7647
/code/branches/resource/data/levels/docking.oxw	3327-3366
/code/branches/resource2/data/levels/docking.oxw	3372-5694
/code/branches/rocket/data/levels/docking.oxw	6523-6950
/code/branches/rocket2/data/levels/docking.oxw	6953-6970
/code/branches/script_trigger/data/levels/docking.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/docking.oxw	6559-6989
/code/branches/sound/data/levels/docking.oxw	2829-3010
/code/branches/sound3/data/levels/docking.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/docking.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/docking.oxw	8460-8613
/code/branches/spacerace/data/levels/docking.oxw	8182-8630
/code/branches/steering/data/levels/docking.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/docking.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/docking.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/docking.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/docking.oxw	8453-8636
/code/branches/unity_build/data/levels/docking.oxw	8440-8716
/code/branches/usability/data/levels/docking.oxw	7915-8078
/code/branches/weapon/data/levels/docking.oxw	1925-2094
/code/branches/weapon2/data/levels/docking.oxw	2107-2488
/code/branches/weapons/data/levels/docking.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/docking.oxw	2742-2890

code/branches/presentation2012/data/levels/dynamicMatch.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/environment3/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/formation/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/gamecontent/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/hud/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/menue/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/output/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/pickup2012/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/presentation/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/presentation2011/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/shipSelection/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/sound2012/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/spacegate/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/usability/data/levels/dynamicMatch.oxw	merged	eligible
/code/trunk/data/levels/dynamicMatch.oxw	merged	eligible
/code/branches/ai/data/levels/dynamicMatch.oxw	6592-7033
/code/branches/ai2/data/levels/dynamicMatch.oxw	8721-8880
/code/branches/bigships/data/levels/dynamicMatch.oxw	8137-8588
/code/branches/buildsystem/data/levels/dynamicMatch.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/dynamicMatch.oxw	2506-2658
/code/branches/buildsystem3/data/levels/dynamicMatch.oxw	2662-2708
/code/branches/ceguilua/data/levels/dynamicMatch.oxw	1802-1808
/code/branches/chat/data/levels/dynamicMatch.oxw	6527-6797
/code/branches/chat2/data/levels/dynamicMatch.oxw	6836-6910
/code/branches/console/data/levels/dynamicMatch.oxw	5941-6104
/code/branches/consolecommands2/data/levels/dynamicMatch.oxw	6451-7178
/code/branches/consolecommands3/data/levels/dynamicMatch.oxw	7178-7283
/code/branches/core3/data/levels/dynamicMatch.oxw	1572-1739
/code/branches/core4/data/levels/dynamicMatch.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/dynamicMatch.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/dynamicMatch.oxw	7537-7686
/code/branches/doc/data/levels/dynamicMatch.oxw	7290-7400
/code/branches/dockingsystem/data/levels/dynamicMatch.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/dynamicMatch.oxw	6584-7030
/code/branches/fps/data/levels/dynamicMatch.oxw	6591-7072
/code/branches/gameimmersion/data/levels/dynamicMatch.oxw	8102-8577
/code/branches/gamestate/data/levels/dynamicMatch.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/dynamicMatch.oxw	6594-6745
/code/branches/gametypes/data/levels/dynamicMatch.oxw	2826-3031
/code/branches/gcc43/data/levels/dynamicMatch.oxw	1580
/code/branches/gui/data/levels/dynamicMatch.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/dynamicMatch.oxw	6584-6941
/code/branches/hudimprovements/data/levels/dynamicMatch.oxw	7920-8672
/code/branches/ingamemenu/data/levels/dynamicMatch.oxw	6000-6023
/code/branches/input/data/levels/dynamicMatch.oxw	1629-1636
/code/branches/ipv6/data/levels/dynamicMatch.oxw	7293-7458
/code/branches/kicklib/data/levels/dynamicMatch.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/dynamicMatch.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/dynamicMatch.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/dynamicMatch.oxw	7903-8175
/code/branches/libraries/data/levels/dynamicMatch.oxw	5612-5692
/code/branches/libraries2/data/levels/dynamicMatch.oxw	5703-5737
/code/branches/lod/data/levels/dynamicMatch.oxw	6586-6911
/code/branches/lodfinal/data/levels/dynamicMatch.oxw	2372-2411
/code/branches/mac_osx/data/levels/dynamicMatch.oxw	7789-8128,8135
/code/branches/map/data/levels/dynamicMatch.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/dynamicMatch.oxw	7502-7738
/code/branches/menu/data/levels/dynamicMatch.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/dynamicMatch.oxw	2754-2824
/code/branches/netp2/data/levels/dynamicMatch.oxw	2835-2988
/code/branches/netp3/data/levels/dynamicMatch.oxw	2988-3082
/code/branches/netp6/data/levels/dynamicMatch.oxw	3214-3302
/code/branches/network/data/levels/dynamicMatch.oxw	2356
/code/branches/network2/data/levels/dynamicMatch.oxw	6434-6465
/code/branches/network3/data/levels/dynamicMatch.oxw	7196-7344
/code/branches/network4/data/levels/dynamicMatch.oxw	7497-7755
/code/branches/network5/data/levels/dynamicMatch.oxw	7757-7781
/code/branches/network6/data/levels/dynamicMatch.oxw	7823-8315
/code/branches/network64/data/levels/dynamicMatch.oxw	2210-2355
/code/branches/notifications/data/levels/dynamicMatch.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/dynamicMatch.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/dynamicMatch.oxw	2171-2479
/code/branches/ois_update/data/levels/dynamicMatch.oxw	7506-7788
/code/branches/overlay/data/levels/dynamicMatch.oxw	2117-2385
/code/branches/particles/data/levels/dynamicMatch.oxw	2829-3085
/code/branches/particles2/data/levels/dynamicMatch.oxw	6050-6106,6109
/code/branches/pch/data/levels/dynamicMatch.oxw	3113-3194
/code/branches/physics/data/levels/dynamicMatch.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/dynamicMatch.oxw	2436-2457
/code/branches/pickup/data/levels/dynamicMatch.oxw	8145-8555
/code/branches/pickup2/data/levels/dynamicMatch.oxw	5942-6405
/code/branches/pickup3/data/levels/dynamicMatch.oxw	6418-6523
/code/branches/pickup4/data/levels/dynamicMatch.oxw	6594-6710
/code/branches/pickups/data/levels/dynamicMatch.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/dynamicMatch.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/dynamicMatch.oxw	7262-7263
/code/branches/portals/data/levels/dynamicMatch.oxw	8087-8455
/code/branches/portals2/data/levels/dynamicMatch.oxw	8460-8602
/code/branches/ppspickups1/data/levels/dynamicMatch.oxw	6552-6708
/code/branches/ppspickups2/data/levels/dynamicMatch.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/dynamicMatch.oxw	6757-6997
/code/branches/ppspickups4/data/levels/dynamicMatch.oxw	7003-7089
/code/branches/presentation2/data/levels/dynamicMatch.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/dynamicMatch.oxw	6913-7162
/code/branches/questsystem/data/levels/dynamicMatch.oxw	1894-2088
/code/branches/questsystem2/data/levels/dynamicMatch.oxw	2107-2259
/code/branches/questsystem5/data/levels/dynamicMatch.oxw	2776-2905
/code/branches/releasetodo/data/levels/dynamicMatch.oxw	7614-7647
/code/branches/resource/data/levels/dynamicMatch.oxw	3327-3366
/code/branches/resource2/data/levels/dynamicMatch.oxw	3372-5694
/code/branches/rocket/data/levels/dynamicMatch.oxw	6523-6950
/code/branches/rocket2/data/levels/dynamicMatch.oxw	6953-6970
/code/branches/script_trigger/data/levels/dynamicMatch.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/dynamicMatch.oxw	6559-6989
/code/branches/sound/data/levels/dynamicMatch.oxw	2829-3010
/code/branches/sound3/data/levels/dynamicMatch.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/dynamicMatch.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/dynamicMatch.oxw	8460-8613
/code/branches/spacerace/data/levels/dynamicMatch.oxw	8182-8630
/code/branches/steering/data/levels/dynamicMatch.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/dynamicMatch.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/dynamicMatch.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/dynamicMatch.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/dynamicMatch.oxw	8453-8636
/code/branches/unity_build/data/levels/dynamicMatch.oxw	8440-8716
/code/branches/weapon/data/levels/dynamicMatch.oxw	1925-2094
/code/branches/weapon2/data/levels/dynamicMatch.oxw	2107-2488
/code/branches/weapons/data/levels/dynamicMatch.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/dynamicMatch.oxw	2742-2890

code/branches/presentation2012/data/levels/earth.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/earth.oxw	merged	eligible
/code/branches/formation/data/levels/earth.oxw	merged	eligible
/code/branches/gamecontent/data/levels/earth.oxw	merged	eligible
/code/branches/hud/data/levels/earth.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/earth.oxw	merged	eligible
/code/branches/menue/data/levels/earth.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/earth.oxw	merged	eligible
/code/branches/output/data/levels/earth.oxw	merged	eligible
/code/branches/pickup2012/data/levels/earth.oxw	merged	eligible
/code/branches/presentation/data/levels/earth.oxw	merged	eligible
/code/branches/presentation2011/data/levels/earth.oxw	merged	eligible
/code/branches/shipSelection/data/levels/earth.oxw	merged	eligible
/code/branches/sound2012/data/levels/earth.oxw	merged	eligible
/code/branches/spacegate/data/levels/earth.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/earth.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/earth.oxw	merged	eligible
/code/trunk/data/levels/earth.oxw	merged	eligible
/code/branches/ai/data/levels/earth.oxw	6592-7033
/code/branches/ai2/data/levels/earth.oxw	8721-8880
/code/branches/bigships/data/levels/earth.oxw	8137-8588
/code/branches/buildsystem/data/levels/earth.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/earth.oxw	2506-2658
/code/branches/buildsystem3/data/levels/earth.oxw	2662-2708
/code/branches/ceguilua/data/levels/earth.oxw	1802-1808
/code/branches/chat/data/levels/earth.oxw	6527-6797
/code/branches/chat2/data/levels/earth.oxw	6836-6910
/code/branches/console/data/levels/earth.oxw	5941-6104
/code/branches/consolecommands2/data/levels/earth.oxw	6451-7178
/code/branches/consolecommands3/data/levels/earth.oxw	7178-7283
/code/branches/core3/data/levels/earth.oxw	1572-1739
/code/branches/core4/data/levels/earth.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/earth.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/earth.oxw	7537-7686
/code/branches/doc/data/levels/earth.oxw	7290-7400
/code/branches/dockingsystem/data/levels/earth.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/earth.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/earth.oxw	6584-7030
/code/branches/fps/data/levels/earth.oxw	6591-7072
/code/branches/gameimmersion/data/levels/earth.oxw	8102-8577
/code/branches/gamestate/data/levels/earth.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/earth.oxw	6594-6745
/code/branches/gametypes/data/levels/earth.oxw	2826-3031
/code/branches/gcc43/data/levels/earth.oxw	1580
/code/branches/gui/data/levels/earth.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/earth.oxw	6584-6941
/code/branches/hudimprovements/data/levels/earth.oxw	7920-8672
/code/branches/ingamemenu/data/levels/earth.oxw	6000-6023
/code/branches/input/data/levels/earth.oxw	1629-1636
/code/branches/ipv6/data/levels/earth.oxw	7293-7458
/code/branches/kicklib/data/levels/earth.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/earth.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/earth.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/earth.oxw	7903-8175
/code/branches/libraries/data/levels/earth.oxw	5612-5692
/code/branches/libraries2/data/levels/earth.oxw	5703-5737
/code/branches/lod/data/levels/earth.oxw	6586-6911
/code/branches/lodfinal/data/levels/earth.oxw	2372-2411
/code/branches/mac_osx/data/levels/earth.oxw	7789-8128,8135
/code/branches/map/data/levels/earth.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/earth.oxw	7502-7738
/code/branches/menu/data/levels/earth.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/earth.oxw	2754-2824
/code/branches/netp2/data/levels/earth.oxw	2835-2988
/code/branches/netp3/data/levels/earth.oxw	2988-3082
/code/branches/netp6/data/levels/earth.oxw	3214-3302
/code/branches/network/data/levels/earth.oxw	2356
/code/branches/network2/data/levels/earth.oxw	6434-6465
/code/branches/network3/data/levels/earth.oxw	7196-7344
/code/branches/network4/data/levels/earth.oxw	7497-7755
/code/branches/network5/data/levels/earth.oxw	7757-7781
/code/branches/network6/data/levels/earth.oxw	7823-8315
/code/branches/network64/data/levels/earth.oxw	2210-2355
/code/branches/notifications/data/levels/earth.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/earth.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/earth.oxw	2171-2479
/code/branches/ois_update/data/levels/earth.oxw	7506-7788
/code/branches/overlay/data/levels/earth.oxw	2117-2385
/code/branches/particles/data/levels/earth.oxw	2829-3085
/code/branches/particles2/data/levels/earth.oxw	6050-6106,6109
/code/branches/pch/data/levels/earth.oxw	3113-3194
/code/branches/physics/data/levels/earth.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/earth.oxw	2436-2457
/code/branches/pickup/data/levels/earth.oxw	8145-8555
/code/branches/pickup2/data/levels/earth.oxw	5942-6405
/code/branches/pickup3/data/levels/earth.oxw	6418-6523
/code/branches/pickup4/data/levels/earth.oxw	6594-6710
/code/branches/pickups/data/levels/earth.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/earth.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/earth.oxw	7262-7263
/code/branches/portals/data/levels/earth.oxw	8087-8455
/code/branches/portals2/data/levels/earth.oxw	8460-8602
/code/branches/ppspickups1/data/levels/earth.oxw	6552-6708
/code/branches/ppspickups2/data/levels/earth.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/earth.oxw	6757-6997
/code/branches/ppspickups4/data/levels/earth.oxw	7003-7089
/code/branches/presentation2/data/levels/earth.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/earth.oxw	6913-7162
/code/branches/questsystem/data/levels/earth.oxw	1894-2088
/code/branches/questsystem2/data/levels/earth.oxw	2107-2259
/code/branches/questsystem5/data/levels/earth.oxw	2776-2905
/code/branches/releasetodo/data/levels/earth.oxw	7614-7647
/code/branches/resource/data/levels/earth.oxw	3327-3366
/code/branches/resource2/data/levels/earth.oxw	3372-5694
/code/branches/rocket/data/levels/earth.oxw	6523-6950
/code/branches/rocket2/data/levels/earth.oxw	6953-6970
/code/branches/script_trigger/data/levels/earth.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/earth.oxw	6559-6989
/code/branches/sound/data/levels/earth.oxw	2829-3010
/code/branches/sound3/data/levels/earth.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/earth.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/earth.oxw	8460-8613
/code/branches/spacerace/data/levels/earth.oxw	8182-8630
/code/branches/steering/data/levels/earth.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/earth.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/earth.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/earth.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/earth.oxw	8453-8636
/code/branches/unity_build/data/levels/earth.oxw	8440-8716
/code/branches/usability/data/levels/earth.oxw	7915-8078
/code/branches/weapon/data/levels/earth.oxw	1925-2094
/code/branches/weapon2/data/levels/earth.oxw	2107-2488
/code/branches/weapons/data/levels/earth.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/earth.oxw	2742-2890

code/branches/presentation2012/data/levels/emptyLevel.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/environment3/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/formation/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/gamecontent/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/hud/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/menue/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/output/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/pickup2012/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/presentation/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/presentation2011/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/shipSelection/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/sound2012/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/spacegate/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/usability/data/levels/emptyLevel.oxw	merged	eligible
/code/trunk/data/levels/emptyLevel.oxw	merged	eligible
/code/branches/ai/data/levels/emptyLevel.oxw	6592-7033
/code/branches/ai2/data/levels/emptyLevel.oxw	8721-8880
/code/branches/bigships/data/levels/emptyLevel.oxw	8137-8588
/code/branches/buildsystem/data/levels/emptyLevel.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/emptyLevel.oxw	2506-2658
/code/branches/buildsystem3/data/levels/emptyLevel.oxw	2662-2708
/code/branches/ceguilua/data/levels/emptyLevel.oxw	1802-1808
/code/branches/chat/data/levels/emptyLevel.oxw	6527-6797
/code/branches/chat2/data/levels/emptyLevel.oxw	6836-6910
/code/branches/console/data/levels/emptyLevel.oxw	5941-6104
/code/branches/consolecommands2/data/levels/emptyLevel.oxw	6451-7178
/code/branches/consolecommands3/data/levels/emptyLevel.oxw	7178-7283
/code/branches/core3/data/levels/emptyLevel.oxw	1572-1739
/code/branches/core4/data/levels/emptyLevel.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/emptyLevel.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/emptyLevel.oxw	7537-7686
/code/branches/doc/data/levels/emptyLevel.oxw	7290-7400
/code/branches/dockingsystem/data/levels/emptyLevel.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/emptyLevel.oxw	6584-7030
/code/branches/fps/data/levels/emptyLevel.oxw	6591-7072
/code/branches/gameimmersion/data/levels/emptyLevel.oxw	8102-8577
/code/branches/gamestate/data/levels/emptyLevel.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/emptyLevel.oxw	6594-6745
/code/branches/gametypes/data/levels/emptyLevel.oxw	2826-3031
/code/branches/gcc43/data/levels/emptyLevel.oxw	1580
/code/branches/gui/data/levels/emptyLevel.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/emptyLevel.oxw	6584-6941
/code/branches/hudimprovements/data/levels/emptyLevel.oxw	7920-8672
/code/branches/ingamemenu/data/levels/emptyLevel.oxw	6000-6023
/code/branches/input/data/levels/emptyLevel.oxw	1629-1636
/code/branches/ipv6/data/levels/emptyLevel.oxw	7293-7458
/code/branches/kicklib/data/levels/emptyLevel.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/emptyLevel.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/emptyLevel.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/emptyLevel.oxw	7903-8175
/code/branches/libraries/data/levels/emptyLevel.oxw	5612-5692
/code/branches/libraries2/data/levels/emptyLevel.oxw	5703-5737
/code/branches/lod/data/levels/emptyLevel.oxw	6586-6911
/code/branches/lodfinal/data/levels/emptyLevel.oxw	2372-2411
/code/branches/mac_osx/data/levels/emptyLevel.oxw	7789-8128,8135
/code/branches/map/data/levels/emptyLevel.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/emptyLevel.oxw	7502-7738
/code/branches/menu/data/levels/emptyLevel.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/emptyLevel.oxw	2754-2824
/code/branches/netp2/data/levels/emptyLevel.oxw	2835-2988
/code/branches/netp3/data/levels/emptyLevel.oxw	2988-3082
/code/branches/netp6/data/levels/emptyLevel.oxw	3214-3302
/code/branches/network/data/levels/emptyLevel.oxw	2356
/code/branches/network2/data/levels/emptyLevel.oxw	6434-6465
/code/branches/network3/data/levels/emptyLevel.oxw	7196-7344
/code/branches/network4/data/levels/emptyLevel.oxw	7497-7755
/code/branches/network5/data/levels/emptyLevel.oxw	7757-7781
/code/branches/network6/data/levels/emptyLevel.oxw	7823-8315
/code/branches/network64/data/levels/emptyLevel.oxw	2210-2355
/code/branches/notifications/data/levels/emptyLevel.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/emptyLevel.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/emptyLevel.oxw	2171-2479
/code/branches/ois_update/data/levels/emptyLevel.oxw	7506-7788
/code/branches/overlay/data/levels/emptyLevel.oxw	2117-2385
/code/branches/particles/data/levels/emptyLevel.oxw	2829-3085
/code/branches/particles2/data/levels/emptyLevel.oxw	6050-6106,6109
/code/branches/pch/data/levels/emptyLevel.oxw	3113-3194
/code/branches/physics/data/levels/emptyLevel.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/emptyLevel.oxw	2436-2457
/code/branches/pickup/data/levels/emptyLevel.oxw	8145-8555
/code/branches/pickup2/data/levels/emptyLevel.oxw	5942-6405
/code/branches/pickup3/data/levels/emptyLevel.oxw	6418-6523
/code/branches/pickup4/data/levels/emptyLevel.oxw	6594-6710
/code/branches/pickups/data/levels/emptyLevel.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/emptyLevel.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/emptyLevel.oxw	7262-7263
/code/branches/portals/data/levels/emptyLevel.oxw	8087-8455
/code/branches/portals2/data/levels/emptyLevel.oxw	8460-8602
/code/branches/ppspickups1/data/levels/emptyLevel.oxw	6552-6708
/code/branches/ppspickups2/data/levels/emptyLevel.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/emptyLevel.oxw	6757-6997
/code/branches/ppspickups4/data/levels/emptyLevel.oxw	7003-7089
/code/branches/presentation2/data/levels/emptyLevel.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/emptyLevel.oxw	6913-7162
/code/branches/questsystem/data/levels/emptyLevel.oxw	1894-2088
/code/branches/questsystem2/data/levels/emptyLevel.oxw	2107-2259
/code/branches/questsystem5/data/levels/emptyLevel.oxw	2776-2905
/code/branches/releasetodo/data/levels/emptyLevel.oxw	7614-7647
/code/branches/resource/data/levels/emptyLevel.oxw	3327-3366
/code/branches/resource2/data/levels/emptyLevel.oxw	3372-5694
/code/branches/rocket/data/levels/emptyLevel.oxw	6523-6950
/code/branches/rocket2/data/levels/emptyLevel.oxw	6953-6970
/code/branches/script_trigger/data/levels/emptyLevel.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/emptyLevel.oxw	6559-6989
/code/branches/sound/data/levels/emptyLevel.oxw	2829-3010
/code/branches/sound3/data/levels/emptyLevel.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/emptyLevel.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/emptyLevel.oxw	8460-8613
/code/branches/spacerace/data/levels/emptyLevel.oxw	8182-8630
/code/branches/steering/data/levels/emptyLevel.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/emptyLevel.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/emptyLevel.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/emptyLevel.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/emptyLevel.oxw	8453-8636
/code/branches/unity_build/data/levels/emptyLevel.oxw	8440-8716
/code/branches/weapon/data/levels/emptyLevel.oxw	1925-2094
/code/branches/weapon2/data/levels/emptyLevel.oxw	2107-2488
/code/branches/weapons/data/levels/emptyLevel.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/emptyLevel.oxw	2742-2890

-                      r9229
+                      r9241
   include("templates/spaceshipAssff2.oxt")
   include("templates/spaceshipPirate.oxt")
+    include("templates/pickupRepresentationTemplates.oxt")
 ?>
 …
+  >
+    <?lua
+      include("includes/pickups.oxi")
+    ?>
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />

code/branches/presentation2012/data/levels/events.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/events.oxw	merged	eligible
/code/branches/environment3/data/levels/events.oxw	merged	eligible
/code/branches/formation/data/levels/events.oxw	merged	eligible
/code/branches/gamecontent/data/levels/events.oxw	merged	eligible
/code/branches/hud/data/levels/events.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/events.oxw	merged	eligible
/code/branches/menue/data/levels/events.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/events.oxw	merged	eligible
/code/branches/output/data/levels/events.oxw	merged	eligible
/code/branches/pickup2012/data/levels/events.oxw	merged	eligible
/code/branches/presentation/data/levels/events.oxw	merged	eligible
/code/branches/presentation2011/data/levels/events.oxw	merged	eligible
/code/branches/shipSelection/data/levels/events.oxw	merged	eligible
/code/branches/sound2012/data/levels/events.oxw	merged	eligible
/code/branches/spacegate/data/levels/events.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/events.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/events.oxw	merged	eligible
/code/branches/usability/data/levels/events.oxw	merged	eligible
/code/trunk/data/levels/events.oxw	merged	eligible
/code/branches/ai/data/levels/events.oxw	6592-7033
/code/branches/ai2/data/levels/events.oxw	8721-8880
/code/branches/bigships/data/levels/events.oxw	8137-8588
/code/branches/buildsystem/data/levels/events.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/events.oxw	2506-2658
/code/branches/buildsystem3/data/levels/events.oxw	2662-2708
/code/branches/ceguilua/data/levels/events.oxw	1802-1808
/code/branches/chat/data/levels/events.oxw	6527-6797
/code/branches/chat2/data/levels/events.oxw	6836-6910
/code/branches/console/data/levels/events.oxw	5941-6104
/code/branches/consolecommands2/data/levels/events.oxw	6451-7178
/code/branches/consolecommands3/data/levels/events.oxw	7178-7283
/code/branches/core3/data/levels/events.oxw	1572-1739
/code/branches/core4/data/levels/events.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/events.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/events.oxw	7537-7686
/code/branches/doc/data/levels/events.oxw	7290-7400
/code/branches/dockingsystem/data/levels/events.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/events.oxw	6584-7030
/code/branches/fps/data/levels/events.oxw	6591-7072
/code/branches/gameimmersion/data/levels/events.oxw	8102-8577
/code/branches/gamestate/data/levels/events.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/events.oxw	6594-6745
/code/branches/gametypes/data/levels/events.oxw	2826-3031
/code/branches/gcc43/data/levels/events.oxw	1580
/code/branches/gui/data/levels/events.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/events.oxw	6584-6941
/code/branches/hudimprovements/data/levels/events.oxw	7920-8672
/code/branches/ingamemenu/data/levels/events.oxw	6000-6023
/code/branches/input/data/levels/events.oxw	1629-1636
/code/branches/ipv6/data/levels/events.oxw	7293-7458
/code/branches/kicklib/data/levels/events.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/events.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/events.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/events.oxw	7903-8175
/code/branches/libraries/data/levels/events.oxw	5612-5692
/code/branches/libraries2/data/levels/events.oxw	5703-5737
/code/branches/lod/data/levels/events.oxw	6586-6911
/code/branches/lodfinal/data/levels/events.oxw	2372-2411
/code/branches/mac_osx/data/levels/events.oxw	7789-8128,8135
/code/branches/map/data/levels/events.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/events.oxw	7502-7738
/code/branches/menu/data/levels/events.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/events.oxw	2754-2824
/code/branches/netp2/data/levels/events.oxw	2835-2988
/code/branches/netp3/data/levels/events.oxw	2988-3082
/code/branches/netp6/data/levels/events.oxw	3214-3302
/code/branches/network/data/levels/events.oxw	2356
/code/branches/network2/data/levels/events.oxw	6434-6465
/code/branches/network3/data/levels/events.oxw	7196-7344
/code/branches/network4/data/levels/events.oxw	7497-7755
/code/branches/network5/data/levels/events.oxw	7757-7781
/code/branches/network6/data/levels/events.oxw	7823-8315
/code/branches/network64/data/levels/events.oxw	2210-2355
/code/branches/notifications/data/levels/events.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/events.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/events.oxw	2171-2479
/code/branches/ois_update/data/levels/events.oxw	7506-7788
/code/branches/overlay/data/levels/events.oxw	2117-2385
/code/branches/particles/data/levels/events.oxw	2829-3085
/code/branches/particles2/data/levels/events.oxw	6050-6106,6109
/code/branches/pch/data/levels/events.oxw	3113-3194
/code/branches/physics/data/levels/events.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/events.oxw	2436-2457
/code/branches/pickup/data/levels/events.oxw	8145-8555
/code/branches/pickup2/data/levels/events.oxw	5942-6405
/code/branches/pickup3/data/levels/events.oxw	6418-6523
/code/branches/pickup4/data/levels/events.oxw	6594-6710
/code/branches/pickups/data/levels/events.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/events.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/events.oxw	7262-7263
/code/branches/portals/data/levels/events.oxw	8087-8455
/code/branches/portals2/data/levels/events.oxw	8460-8602
/code/branches/ppspickups1/data/levels/events.oxw	6552-6708
/code/branches/ppspickups2/data/levels/events.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/events.oxw	6757-6997
/code/branches/ppspickups4/data/levels/events.oxw	7003-7089
/code/branches/presentation2/data/levels/events.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/events.oxw	6913-7162
/code/branches/questsystem/data/levels/events.oxw	1894-2088
/code/branches/questsystem2/data/levels/events.oxw	2107-2259
/code/branches/questsystem5/data/levels/events.oxw	2776-2905
/code/branches/releasetodo/data/levels/events.oxw	7614-7647
/code/branches/resource/data/levels/events.oxw	3327-3366
/code/branches/resource2/data/levels/events.oxw	3372-5694
/code/branches/rocket/data/levels/events.oxw	6523-6950
/code/branches/rocket2/data/levels/events.oxw	6953-6970
/code/branches/script_trigger/data/levels/events.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/events.oxw	6559-6989
/code/branches/sound/data/levels/events.oxw	2829-3010
/code/branches/sound3/data/levels/events.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/events.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/events.oxw	8460-8613
/code/branches/spacerace/data/levels/events.oxw	8182-8630
/code/branches/steering/data/levels/events.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/events.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/events.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/events.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/events.oxw	8453-8636
/code/branches/unity_build/data/levels/events.oxw	8440-8716
/code/branches/weapon/data/levels/events.oxw	1925-2094
/code/branches/weapon2/data/levels/events.oxw	2107-2488
/code/branches/weapons/data/levels/events.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/events.oxw	2742-2890

code/branches/presentation2012/data/levels/fightInOurBack.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/environment3/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/formation/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/gamecontent/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/hud/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/menue/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/output/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/pickup2012/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/presentation/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/presentation2011/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/shipSelection/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/sound2012/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/spacegate/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/usability/data/levels/fightInOurBack.oxw	merged	eligible
/code/trunk/data/levels/fightInOurBack.oxw	merged	eligible
/code/branches/ai/data/levels/fightInOurBack.oxw	6592-7033
/code/branches/ai2/data/levels/fightInOurBack.oxw	8721-8880
/code/branches/bigships/data/levels/fightInOurBack.oxw	8137-8588
/code/branches/buildsystem/data/levels/fightInOurBack.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/fightInOurBack.oxw	2506-2658
/code/branches/buildsystem3/data/levels/fightInOurBack.oxw	2662-2708
/code/branches/ceguilua/data/levels/fightInOurBack.oxw	1802-1808
/code/branches/chat/data/levels/fightInOurBack.oxw	6527-6797
/code/branches/chat2/data/levels/fightInOurBack.oxw	6836-6910
/code/branches/console/data/levels/fightInOurBack.oxw	5941-6104
/code/branches/consolecommands2/data/levels/fightInOurBack.oxw	6451-7178
/code/branches/consolecommands3/data/levels/fightInOurBack.oxw	7178-7283
/code/branches/core3/data/levels/fightInOurBack.oxw	1572-1739
/code/branches/core4/data/levels/fightInOurBack.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/fightInOurBack.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/fightInOurBack.oxw	7537-7686
/code/branches/doc/data/levels/fightInOurBack.oxw	7290-7400
/code/branches/dockingsystem/data/levels/fightInOurBack.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/fightInOurBack.oxw	6584-7030
/code/branches/fps/data/levels/fightInOurBack.oxw	6591-7072
/code/branches/gameimmersion/data/levels/fightInOurBack.oxw	8102-8577
/code/branches/gamestate/data/levels/fightInOurBack.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/fightInOurBack.oxw	6594-6745
/code/branches/gametypes/data/levels/fightInOurBack.oxw	2826-3031
/code/branches/gcc43/data/levels/fightInOurBack.oxw	1580
/code/branches/gui/data/levels/fightInOurBack.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/fightInOurBack.oxw	6584-6941
/code/branches/hudimprovements/data/levels/fightInOurBack.oxw	7920-8672
/code/branches/ingamemenu/data/levels/fightInOurBack.oxw	6000-6023
/code/branches/input/data/levels/fightInOurBack.oxw	1629-1636
/code/branches/ipv6/data/levels/fightInOurBack.oxw	7293-7458
/code/branches/kicklib/data/levels/fightInOurBack.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/fightInOurBack.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/fightInOurBack.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/fightInOurBack.oxw	7903-8175
/code/branches/libraries/data/levels/fightInOurBack.oxw	5612-5692
/code/branches/libraries2/data/levels/fightInOurBack.oxw	5703-5737
/code/branches/lod/data/levels/fightInOurBack.oxw	6586-6911
/code/branches/lodfinal/data/levels/fightInOurBack.oxw	2372-2411
/code/branches/mac_osx/data/levels/fightInOurBack.oxw	7789-8128,8135
/code/branches/map/data/levels/fightInOurBack.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/fightInOurBack.oxw	7502-7738
/code/branches/menu/data/levels/fightInOurBack.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/fightInOurBack.oxw	2754-2824
/code/branches/netp2/data/levels/fightInOurBack.oxw	2835-2988
/code/branches/netp3/data/levels/fightInOurBack.oxw	2988-3082
/code/branches/netp6/data/levels/fightInOurBack.oxw	3214-3302
/code/branches/network/data/levels/fightInOurBack.oxw	2356
/code/branches/network2/data/levels/fightInOurBack.oxw	6434-6465
/code/branches/network3/data/levels/fightInOurBack.oxw	7196-7344
/code/branches/network4/data/levels/fightInOurBack.oxw	7497-7755
/code/branches/network5/data/levels/fightInOurBack.oxw	7757-7781
/code/branches/network6/data/levels/fightInOurBack.oxw	7823-8315
/code/branches/network64/data/levels/fightInOurBack.oxw	2210-2355
/code/branches/notifications/data/levels/fightInOurBack.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/fightInOurBack.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/fightInOurBack.oxw	2171-2479
/code/branches/ois_update/data/levels/fightInOurBack.oxw	7506-7788
/code/branches/overlay/data/levels/fightInOurBack.oxw	2117-2385
/code/branches/particles/data/levels/fightInOurBack.oxw	2829-3085
/code/branches/particles2/data/levels/fightInOurBack.oxw	6050-6106,6109
/code/branches/pch/data/levels/fightInOurBack.oxw	3113-3194
/code/branches/physics/data/levels/fightInOurBack.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/fightInOurBack.oxw	2436-2457
/code/branches/pickup/data/levels/fightInOurBack.oxw	8145-8555
/code/branches/pickup2/data/levels/fightInOurBack.oxw	5942-6405
/code/branches/pickup3/data/levels/fightInOurBack.oxw	6418-6523
/code/branches/pickup4/data/levels/fightInOurBack.oxw	6594-6710
/code/branches/pickups/data/levels/fightInOurBack.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/fightInOurBack.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/fightInOurBack.oxw	7262-7263
/code/branches/portals/data/levels/fightInOurBack.oxw	8087-8455
/code/branches/portals2/data/levels/fightInOurBack.oxw	8460-8602
/code/branches/ppspickups1/data/levels/fightInOurBack.oxw	6552-6708
/code/branches/ppspickups2/data/levels/fightInOurBack.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/fightInOurBack.oxw	6757-6997
/code/branches/ppspickups4/data/levels/fightInOurBack.oxw	7003-7089
/code/branches/presentation2/data/levels/fightInOurBack.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/fightInOurBack.oxw	6913-7162
/code/branches/questsystem/data/levels/fightInOurBack.oxw	1894-2088
/code/branches/questsystem2/data/levels/fightInOurBack.oxw	2107-2259
/code/branches/questsystem5/data/levels/fightInOurBack.oxw	2776-2905
/code/branches/releasetodo/data/levels/fightInOurBack.oxw	7614-7647
/code/branches/resource/data/levels/fightInOurBack.oxw	3327-3366
/code/branches/resource2/data/levels/fightInOurBack.oxw	3372-5694
/code/branches/rocket/data/levels/fightInOurBack.oxw	6523-6950
/code/branches/rocket2/data/levels/fightInOurBack.oxw	6953-6970
/code/branches/script_trigger/data/levels/fightInOurBack.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/fightInOurBack.oxw	6559-6989
/code/branches/sound/data/levels/fightInOurBack.oxw	2829-3010
/code/branches/sound3/data/levels/fightInOurBack.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/fightInOurBack.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/fightInOurBack.oxw	8460-8613
/code/branches/spacerace/data/levels/fightInOurBack.oxw	8182-8630
/code/branches/steering/data/levels/fightInOurBack.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/fightInOurBack.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/fightInOurBack.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/fightInOurBack.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/fightInOurBack.oxw	8453-8636
/code/branches/unity_build/data/levels/fightInOurBack.oxw	8440-8716
/code/branches/weapon/data/levels/fightInOurBack.oxw	1925-2094
/code/branches/weapon2/data/levels/fightInOurBack.oxw	2107-2488
/code/branches/weapons/data/levels/fightInOurBack.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/fightInOurBack.oxw	2742-2890

code/branches/presentation2012/data/levels/includes

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/includes	merged	eligible
/code/branches/environment3/data/levels/includes	merged	eligible
/code/branches/formation/data/levels/includes	merged	eligible
/code/branches/gamecontent/data/levels/includes	merged	eligible
/code/branches/hud/data/levels/includes	merged	eligible
/code/branches/masterserverfix/data/levels/includes	merged	eligible
/code/branches/menue/data/levels/includes	merged	eligible
/code/branches/newlevel2012/data/levels/includes	merged	eligible
/code/branches/output/data/levels/includes	merged	eligible
/code/branches/pickup2012/data/levels/includes	merged	eligible
/code/branches/presentation/data/levels/includes	merged	eligible
/code/branches/presentation2011/data/levels/includes	merged	eligible
/code/branches/shipSelection/data/levels/includes	merged	eligible
/code/branches/sound2012/data/levels/includes	merged	non-inheritable	eligible
/code/branches/spacegate/data/levels/includes	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes	merged	eligible
/code/branches/surfaceRace/data/levels/includes	merged	eligible
/code/branches/usability/data/levels/includes	merged	eligible
/code/trunk/data/levels/includes	merged	eligible
/code/branches/ai/data/levels/includes	6592-7033
/code/branches/ai2/data/levels/includes	8721-8880
/code/branches/bigships/data/levels/includes	8137-8588
/code/branches/buildsystem/data/levels/includes	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes	2506-2658
/code/branches/buildsystem3/data/levels/includes	2662-2708
/code/branches/ceguilua/data/levels/includes	1802-1808
/code/branches/chat/data/levels/includes	6527-6797
/code/branches/chat2/data/levels/includes	6836-6910
/code/branches/console/data/levels/includes	5941-6104
/code/branches/consolecommands2/data/levels/includes	6451-7178
/code/branches/consolecommands3/data/levels/includes	7178-7283
/code/branches/core3/data/levels/includes	1572-1739
/code/branches/core4/data/levels/includes	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes	7537-7686
/code/branches/doc/data/levels/includes	7290-7400
/code/branches/dockingsystem/data/levels/includes	8101-8192
/code/branches/dynamicmatch/data/levels/includes	6584-7030
/code/branches/fps/data/levels/includes	6591-7072
/code/branches/gameimmersion/data/levels/includes	8102-8577
/code/branches/gamestate/data/levels/includes	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes	6594-6745
/code/branches/gametypes/data/levels/includes	2826-3031
/code/branches/gcc43/data/levels/includes	1580
/code/branches/gui/data/levels/includes	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes	6584-6941
/code/branches/hudimprovements/data/levels/includes	7920-8672
/code/branches/ingamemenu/data/levels/includes	6000-6023
/code/branches/input/data/levels/includes	1629-1636
/code/branches/ipv6/data/levels/includes	7293-7458
/code/branches/kicklib/data/levels/includes	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes	8282-8350
/code/branches/lastmanstanding/data/levels/includes	7479-7644
/code/branches/lastmanstanding3/data/levels/includes	7903-8175
/code/branches/libraries/data/levels/includes	5612-5692
/code/branches/libraries2/data/levels/includes	5703-5737
/code/branches/lod/data/levels/includes	6586-6911
/code/branches/lodfinal/data/levels/includes	2372-2411
/code/branches/mac_osx/data/levels/includes	7789-8128,8135
/code/branches/map/data/levels/includes	2801-3086,3089
/code/branches/masterserver/data/levels/includes	7502-7738
/code/branches/menu/data/levels/includes	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes	2754-2824
/code/branches/netp2/data/levels/includes	2835-2988
/code/branches/netp3/data/levels/includes	2988-3082
/code/branches/netp6/data/levels/includes	3214-3302
/code/branches/network/data/levels/includes	2356
/code/branches/network2/data/levels/includes	6434-6465
/code/branches/network3/data/levels/includes	7196-7344
/code/branches/network4/data/levels/includes	7497-7755
/code/branches/network5/data/levels/includes	7757-7781
/code/branches/network6/data/levels/includes	7823-8315
/code/branches/network64/data/levels/includes	2210-2355
/code/branches/notifications/data/levels/includes	7314-7401
/code/branches/objecthierarchy/data/levels/includes	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes	2171-2479
/code/branches/ois_update/data/levels/includes	7506-7788
/code/branches/overlay/data/levels/includes	2117-2385
/code/branches/particles/data/levels/includes	2829-3085
/code/branches/particles2/data/levels/includes	6050-6106,6109
/code/branches/pch/data/levels/includes	3113-3194
/code/branches/physics/data/levels/includes	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes	2436-2457
/code/branches/pickup/data/levels/includes	8145-8555
/code/branches/pickup2/data/levels/includes	5942-6405
/code/branches/pickup3/data/levels/includes	6418-6523
/code/branches/pickup4/data/levels/includes	6594-6710
/code/branches/pickups/data/levels/includes	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes	2107-2497,2915-3071
/code/branches/png2/data/levels/includes	7262-7263
/code/branches/portals/data/levels/includes	8087-8455
/code/branches/portals2/data/levels/includes	8460-8602
/code/branches/ppspickups1/data/levels/includes	6552-6708
/code/branches/ppspickups2/data/levels/includes	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes	6757-6997
/code/branches/ppspickups4/data/levels/includes	7003-7089
/code/branches/presentation2/data/levels/includes	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes	6913-7162
/code/branches/questsystem/data/levels/includes	1894-2088
/code/branches/questsystem2/data/levels/includes	2107-2259
/code/branches/questsystem5/data/levels/includes	2776-2905
/code/branches/releasetodo/data/levels/includes	7614-7647
/code/branches/resource/data/levels/includes	3327-3366
/code/branches/resource2/data/levels/includes	3372-5694
/code/branches/rocket/data/levels/includes	6523-6950
/code/branches/rocket2/data/levels/includes	6953-6970
/code/branches/script_trigger/data/levels/includes	1295-1953,1955
/code/branches/skybox2/data/levels/includes	6559-6989
/code/branches/sound/data/levels/includes	2829-3010
/code/branches/sound3/data/levels/includes	5941-6102
/code/branches/spaceboundaries/data/levels/includes	8085-8457
/code/branches/spaceboundaries2/data/levels/includes	8460-8613
/code/branches/spacerace/data/levels/includes	8182-8630
/code/branches/steering/data/levels/includes	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes	8100-8563
/code/branches/tutoriallevel/data/levels/includes	7827-8370
/code/branches/tutoriallevel2/data/levels/includes	8370-8452
/code/branches/tutoriallevel3/data/levels/includes	8453-8636
/code/branches/unity_build/data/levels/includes	8440-8716
/code/branches/weapon/data/levels/includes	1925-2094
/code/branches/weapon2/data/levels/includes	2107-2488
/code/branches/weapons/data/levels/includes	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes	2742-2890

code/branches/presentation2012/data/levels/includes/CuboidSpaceStation.lua

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/environment3/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/formation/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/gamecontent/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/hud/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/masterserverfix/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/menue/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/newlevel2012/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/output/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/pickup2012/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/presentation/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/presentation2011/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/shipSelection/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/sound2012/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/spacegate/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/surfaceRace/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/usability/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/trunk/data/levels/includes/CuboidSpaceStation.lua	merged	eligible
/code/branches/ai/data/levels/includes/CuboidSpaceStation.lua	6592-7033
/code/branches/ai2/data/levels/includes/CuboidSpaceStation.lua	8721-8880
/code/branches/bigships/data/levels/includes/CuboidSpaceStation.lua	8137-8588
/code/branches/buildsystem/data/levels/includes/CuboidSpaceStation.lua	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/CuboidSpaceStation.lua	2506-2658
/code/branches/buildsystem3/data/levels/includes/CuboidSpaceStation.lua	2662-2708
/code/branches/ceguilua/data/levels/includes/CuboidSpaceStation.lua	1802-1808
/code/branches/chat/data/levels/includes/CuboidSpaceStation.lua	6527-6797
/code/branches/chat2/data/levels/includes/CuboidSpaceStation.lua	6836-6910
/code/branches/console/data/levels/includes/CuboidSpaceStation.lua	5941-6104
/code/branches/consolecommands2/data/levels/includes/CuboidSpaceStation.lua	6451-7178
/code/branches/consolecommands3/data/levels/includes/CuboidSpaceStation.lua	7178-7283
/code/branches/core3/data/levels/includes/CuboidSpaceStation.lua	1572-1739
/code/branches/core4/data/levels/includes/CuboidSpaceStation.lua	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/CuboidSpaceStation.lua	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/CuboidSpaceStation.lua	7537-7686
/code/branches/doc/data/levels/includes/CuboidSpaceStation.lua	7290-7400
/code/branches/dockingsystem/data/levels/includes/CuboidSpaceStation.lua	8101-8192
/code/branches/dynamicmatch/data/levels/includes/CuboidSpaceStation.lua	6584-7030
/code/branches/fps/data/levels/includes/CuboidSpaceStation.lua	6591-7072
/code/branches/gameimmersion/data/levels/includes/CuboidSpaceStation.lua	8102-8577
/code/branches/gamestate/data/levels/includes/CuboidSpaceStation.lua	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/CuboidSpaceStation.lua	6594-6745
/code/branches/gametypes/data/levels/includes/CuboidSpaceStation.lua	2826-3031
/code/branches/gcc43/data/levels/includes/CuboidSpaceStation.lua	1580
/code/branches/gui/data/levels/includes/CuboidSpaceStation.lua	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/CuboidSpaceStation.lua	6584-6941
/code/branches/hudimprovements/data/levels/includes/CuboidSpaceStation.lua	7920-8672
/code/branches/ingamemenu/data/levels/includes/CuboidSpaceStation.lua	6000-6023
/code/branches/input/data/levels/includes/CuboidSpaceStation.lua	1629-1636
/code/branches/ipv6/data/levels/includes/CuboidSpaceStation.lua	7293-7458
/code/branches/kicklib/data/levels/includes/CuboidSpaceStation.lua	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/CuboidSpaceStation.lua	8282-8350
/code/branches/lastmanstanding/data/levels/includes/CuboidSpaceStation.lua	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/CuboidSpaceStation.lua	7903-8175
/code/branches/libraries/data/levels/includes/CuboidSpaceStation.lua	5612-5692
/code/branches/libraries2/data/levels/includes/CuboidSpaceStation.lua	5703-5737
/code/branches/lod/data/levels/includes/CuboidSpaceStation.lua	6586-6911
/code/branches/lodfinal/data/levels/includes/CuboidSpaceStation.lua	2372-2411
/code/branches/mac_osx/data/levels/includes/CuboidSpaceStation.lua	7789-8128,8135
/code/branches/map/data/levels/includes/CuboidSpaceStation.lua	2801-3086,3089
/code/branches/masterserver/data/levels/includes/CuboidSpaceStation.lua	7502-7738
/code/branches/menu/data/levels/includes/CuboidSpaceStation.lua	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/CuboidSpaceStation.lua	2754-2824
/code/branches/netp2/data/levels/includes/CuboidSpaceStation.lua	2835-2988
/code/branches/netp3/data/levels/includes/CuboidSpaceStation.lua	2988-3082
/code/branches/netp6/data/levels/includes/CuboidSpaceStation.lua	3214-3302
/code/branches/network/data/levels/includes/CuboidSpaceStation.lua	2356
/code/branches/network2/data/levels/includes/CuboidSpaceStation.lua	6434-6465
/code/branches/network3/data/levels/includes/CuboidSpaceStation.lua	7196-7344
/code/branches/network4/data/levels/includes/CuboidSpaceStation.lua	7497-7755
/code/branches/network5/data/levels/includes/CuboidSpaceStation.lua	7757-7781
/code/branches/network6/data/levels/includes/CuboidSpaceStation.lua	7823-8315
/code/branches/network64/data/levels/includes/CuboidSpaceStation.lua	2210-2355
/code/branches/notifications/data/levels/includes/CuboidSpaceStation.lua	7314-7401
/code/branches/objecthierarchy/data/levels/includes/CuboidSpaceStation.lua	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/CuboidSpaceStation.lua	2171-2479
/code/branches/ois_update/data/levels/includes/CuboidSpaceStation.lua	7506-7788
/code/branches/overlay/data/levels/includes/CuboidSpaceStation.lua	2117-2385
/code/branches/particles/data/levels/includes/CuboidSpaceStation.lua	2829-3085
/code/branches/particles2/data/levels/includes/CuboidSpaceStation.lua	6050-6106,6109
/code/branches/pch/data/levels/includes/CuboidSpaceStation.lua	3113-3194
/code/branches/physics/data/levels/includes/CuboidSpaceStation.lua	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/CuboidSpaceStation.lua	2436-2457
/code/branches/pickup/data/levels/includes/CuboidSpaceStation.lua	8145-8555
/code/branches/pickup2/data/levels/includes/CuboidSpaceStation.lua	5942-6405
/code/branches/pickup3/data/levels/includes/CuboidSpaceStation.lua	6418-6523
/code/branches/pickup4/data/levels/includes/CuboidSpaceStation.lua	6594-6710
/code/branches/pickups/data/levels/includes/CuboidSpaceStation.lua	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/CuboidSpaceStation.lua	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/CuboidSpaceStation.lua	7262-7263
/code/branches/portals/data/levels/includes/CuboidSpaceStation.lua	8087-8455
/code/branches/portals2/data/levels/includes/CuboidSpaceStation.lua	8460-8602
/code/branches/ppspickups1/data/levels/includes/CuboidSpaceStation.lua	6552-6708
/code/branches/ppspickups2/data/levels/includes/CuboidSpaceStation.lua	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/CuboidSpaceStation.lua	6757-6997
/code/branches/ppspickups4/data/levels/includes/CuboidSpaceStation.lua	7003-7089
/code/branches/presentation2/data/levels/includes/CuboidSpaceStation.lua	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/CuboidSpaceStation.lua	6913-7162
/code/branches/questsystem/data/levels/includes/CuboidSpaceStation.lua	1894-2088
/code/branches/questsystem2/data/levels/includes/CuboidSpaceStation.lua	2107-2259
/code/branches/questsystem5/data/levels/includes/CuboidSpaceStation.lua	2776-2905
/code/branches/releasetodo/data/levels/includes/CuboidSpaceStation.lua	7614-7647
/code/branches/resource/data/levels/includes/CuboidSpaceStation.lua	3327-3366
/code/branches/resource2/data/levels/includes/CuboidSpaceStation.lua	3372-5694
/code/branches/rocket/data/levels/includes/CuboidSpaceStation.lua	6523-6950
/code/branches/rocket2/data/levels/includes/CuboidSpaceStation.lua	6953-6970
/code/branches/script_trigger/data/levels/includes/CuboidSpaceStation.lua	1295-1953,1955
/code/branches/skybox2/data/levels/includes/CuboidSpaceStation.lua	6559-6989
/code/branches/sound/data/levels/includes/CuboidSpaceStation.lua	2829-3010
/code/branches/sound3/data/levels/includes/CuboidSpaceStation.lua	5941-6102
/code/branches/spaceboundaries/data/levels/includes/CuboidSpaceStation.lua	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/CuboidSpaceStation.lua	8460-8613
/code/branches/spacerace/data/levels/includes/CuboidSpaceStation.lua	8182-8630
/code/branches/steering/data/levels/includes/CuboidSpaceStation.lua	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/CuboidSpaceStation.lua	8100-8563
/code/branches/tutoriallevel/data/levels/includes/CuboidSpaceStation.lua	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/CuboidSpaceStation.lua	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/CuboidSpaceStation.lua	8453-8636
/code/branches/unity_build/data/levels/includes/CuboidSpaceStation.lua	8440-8716
/code/branches/weapon/data/levels/includes/CuboidSpaceStation.lua	1925-2094
/code/branches/weapon2/data/levels/includes/CuboidSpaceStation.lua	2107-2488
/code/branches/weapons/data/levels/includes/CuboidSpaceStation.lua	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/CuboidSpaceStation.lua	2742-2890

code/branches/presentation2012/data/levels/includes/asteroidField.lua

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/includes/asteroidField.lua	merged	eligible
/code/branches/newlevel2012/data/levels/includes/asteroidField.lua	merged	eligible
/code/branches/pickup2012/data/levels/includes/asteroidField.lua	merged	eligible
/code/branches/presentation2011/data/levels/includes/asteroidField.lua	merged	eligible
/code/branches/shipSelection/data/levels/includes/asteroidField.lua	merged	eligible
/code/branches/sound2012/data/levels/includes/asteroidField.lua	merged	eligible
/code/branches/spacegate/data/levels/includes/asteroidField.lua	merged	eligible
/code/branches/surfaceRace/data/levels/includes/asteroidField.lua	merged	eligible
/code/trunk/data/levels/includes/asteroidField.lua	merged	eligible
/code/branches/ai/data/levels/includes/asteroidField.lua	6592-7033
/code/branches/ai2/data/levels/includes/asteroidField.lua	8721-8880
/code/branches/bigships/data/levels/includes/asteroidField.lua	8137-8588
/code/branches/buildsystem/data/levels/includes/asteroidField.lua	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/asteroidField.lua	2506-2658
/code/branches/buildsystem3/data/levels/includes/asteroidField.lua	2662-2708
/code/branches/ceguilua/data/levels/includes/asteroidField.lua	1802-1808
/code/branches/chat/data/levels/includes/asteroidField.lua	6527-6797
/code/branches/chat2/data/levels/includes/asteroidField.lua	6836-6910
/code/branches/console/data/levels/includes/asteroidField.lua	5941-6104
/code/branches/consolecommands2/data/levels/includes/asteroidField.lua	6451-7178
/code/branches/consolecommands3/data/levels/includes/asteroidField.lua	7178-7283
/code/branches/core3/data/levels/includes/asteroidField.lua	1572-1739
/code/branches/core4/data/levels/includes/asteroidField.lua	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/asteroidField.lua	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/asteroidField.lua	7537-7686
/code/branches/doc/data/levels/includes/asteroidField.lua	7290-7400
/code/branches/dockingsystem/data/levels/includes/asteroidField.lua	8101-8192
/code/branches/dockingsystem2/data/levels/includes/asteroidField.lua	8196-8560
/code/branches/dynamicmatch/data/levels/includes/asteroidField.lua	6584-7030
/code/branches/formation/data/levels/includes/asteroidField.lua	8885-8991
/code/branches/fps/data/levels/includes/asteroidField.lua	6591-7072
/code/branches/gamecontent/data/levels/includes/asteroidField.lua	8893-8968
/code/branches/gameimmersion/data/levels/includes/asteroidField.lua	8102-8577
/code/branches/gamestate/data/levels/includes/asteroidField.lua	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/asteroidField.lua	6594-6745
/code/branches/gametypes/data/levels/includes/asteroidField.lua	2826-3031
/code/branches/gcc43/data/levels/includes/asteroidField.lua	1580
/code/branches/gui/data/levels/includes/asteroidField.lua	1635-1723,2795-2894
/code/branches/hud/data/levels/includes/asteroidField.lua	8883-8986
/code/branches/hudelements/data/levels/includes/asteroidField.lua	6584-6941
/code/branches/hudimprovements/data/levels/includes/asteroidField.lua	7920-8672
/code/branches/ingamemenu/data/levels/includes/asteroidField.lua	6000-6023
/code/branches/input/data/levels/includes/asteroidField.lua	1629-1636
/code/branches/ipv6/data/levels/includes/asteroidField.lua	7293-7458
/code/branches/kicklib/data/levels/includes/asteroidField.lua	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/asteroidField.lua	8282-8350
/code/branches/lastmanstanding/data/levels/includes/asteroidField.lua	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/asteroidField.lua	7903-8175
/code/branches/libraries/data/levels/includes/asteroidField.lua	5612-5692
/code/branches/libraries2/data/levels/includes/asteroidField.lua	5703-5737
/code/branches/lod/data/levels/includes/asteroidField.lua	6586-6911
/code/branches/lodfinal/data/levels/includes/asteroidField.lua	2372-2411
/code/branches/mac_osx/data/levels/includes/asteroidField.lua	7789-8128,8135
/code/branches/map/data/levels/includes/asteroidField.lua	2801-3086,3089
/code/branches/masterserver/data/levels/includes/asteroidField.lua	7502-7738
/code/branches/masterserverfix/data/levels/includes/asteroidField.lua	8933-8936
/code/branches/menu/data/levels/includes/asteroidField.lua	5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/asteroidField.lua	8884-8976
/code/branches/miniprojects/data/levels/includes/asteroidField.lua	2754-2824
/code/branches/netp2/data/levels/includes/asteroidField.lua	2835-2988
/code/branches/netp3/data/levels/includes/asteroidField.lua	2988-3082
/code/branches/netp6/data/levels/includes/asteroidField.lua	3214-3302
/code/branches/network/data/levels/includes/asteroidField.lua	2356
/code/branches/network2/data/levels/includes/asteroidField.lua	6434-6465
/code/branches/network3/data/levels/includes/asteroidField.lua	7196-7344
/code/branches/network4/data/levels/includes/asteroidField.lua	7497-7755
/code/branches/network5/data/levels/includes/asteroidField.lua	7757-7781
/code/branches/network6/data/levels/includes/asteroidField.lua	7823-8315
/code/branches/network64/data/levels/includes/asteroidField.lua	2210-2355
/code/branches/notifications/data/levels/includes/asteroidField.lua	7314-7401
/code/branches/objecthierarchy/data/levels/includes/asteroidField.lua	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/asteroidField.lua	2171-2479
/code/branches/ois_update/data/levels/includes/asteroidField.lua	7506-7788
/code/branches/output/data/levels/includes/asteroidField.lua	8739-8857
/code/branches/overlay/data/levels/includes/asteroidField.lua	2117-2385
/code/branches/particles/data/levels/includes/asteroidField.lua	2829-3085
/code/branches/particles2/data/levels/includes/asteroidField.lua	6050-6106,6109
/code/branches/pch/data/levels/includes/asteroidField.lua	3113-3194
/code/branches/physics/data/levels/includes/asteroidField.lua	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/asteroidField.lua	2436-2457
/code/branches/pickup/data/levels/includes/asteroidField.lua	8145-8555
/code/branches/pickup2/data/levels/includes/asteroidField.lua	5942-6405
/code/branches/pickup3/data/levels/includes/asteroidField.lua	6418-6523
/code/branches/pickup4/data/levels/includes/asteroidField.lua	6594-6710
/code/branches/pickups/data/levels/includes/asteroidField.lua	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/asteroidField.lua	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/asteroidField.lua	7262-7263
/code/branches/portals/data/levels/includes/asteroidField.lua	8087-8455
/code/branches/portals2/data/levels/includes/asteroidField.lua	8460-8602
/code/branches/ppspickups1/data/levels/includes/asteroidField.lua	6552-6708
/code/branches/ppspickups2/data/levels/includes/asteroidField.lua	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/asteroidField.lua	6757-6997
/code/branches/ppspickups4/data/levels/includes/asteroidField.lua	7003-7089
/code/branches/presentation/data/levels/includes/asteroidField.lua	2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/asteroidField.lua	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/asteroidField.lua	6913-7162
/code/branches/questsystem/data/levels/includes/asteroidField.lua	1894-2088
/code/branches/questsystem2/data/levels/includes/asteroidField.lua	2107-2259
/code/branches/questsystem5/data/levels/includes/asteroidField.lua	2776-2905
/code/branches/releasetodo/data/levels/includes/asteroidField.lua	7614-7647
/code/branches/resource/data/levels/includes/asteroidField.lua	3327-3366
/code/branches/resource2/data/levels/includes/asteroidField.lua	3372-5694
/code/branches/rocket/data/levels/includes/asteroidField.lua	6523-6950
/code/branches/rocket2/data/levels/includes/asteroidField.lua	6953-6970
/code/branches/script_trigger/data/levels/includes/asteroidField.lua	1295-1953,1955
/code/branches/skybox2/data/levels/includes/asteroidField.lua	6559-6989
/code/branches/sound/data/levels/includes/asteroidField.lua	2829-3010
/code/branches/sound3/data/levels/includes/asteroidField.lua	5941-6102
/code/branches/spaceboundaries/data/levels/includes/asteroidField.lua	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/asteroidField.lua	8460-8613
/code/branches/spacerace/data/levels/includes/asteroidField.lua	8182-8630
/code/branches/spaceraceTwo/data/levels/includes/asteroidField.lua	8881-8996
/code/branches/steering/data/levels/includes/asteroidField.lua	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/asteroidField.lua	8100-8563
/code/branches/tutoriallevel/data/levels/includes/asteroidField.lua	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/asteroidField.lua	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/asteroidField.lua	8453-8636
/code/branches/unity_build/data/levels/includes/asteroidField.lua	8440-8716
/code/branches/usability/data/levels/includes/asteroidField.lua	7915-8078
/code/branches/weapon/data/levels/includes/asteroidField.lua	1925-2094
/code/branches/weapon2/data/levels/includes/asteroidField.lua	2107-2488
/code/branches/weapons/data/levels/includes/asteroidField.lua	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/asteroidField.lua	2742-2890

code/branches/presentation2012/data/levels/includes/notifications.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/formation/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/gamecontent/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/hud/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/menue/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/output/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/presentation/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/notifications.oxi	merged	eligible
/code/trunk/data/levels/includes/notifications.oxi	merged	eligible
/code/branches/ai/data/levels/includes/notifications.oxi	6592-7033
/code/branches/ai2/data/levels/includes/notifications.oxi	8721-8880
/code/branches/bigships/data/levels/includes/notifications.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/notifications.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/notifications.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/notifications.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/notifications.oxi	1802-1808
/code/branches/chat/data/levels/includes/notifications.oxi	6527-6797
/code/branches/chat2/data/levels/includes/notifications.oxi	6836-6910
/code/branches/console/data/levels/includes/notifications.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/notifications.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/notifications.oxi	7178-7283
/code/branches/core3/data/levels/includes/notifications.oxi	1572-1739
/code/branches/core4/data/levels/includes/notifications.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/notifications.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/notifications.oxi	7537-7686
/code/branches/doc/data/levels/includes/notifications.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/notifications.oxi	8101-8192
/code/branches/dockingsystem2/data/levels/includes/notifications.oxi	8196-8560
/code/branches/dynamicmatch/data/levels/includes/notifications.oxi	6584-7030
/code/branches/fps/data/levels/includes/notifications.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/notifications.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/notifications.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/notifications.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/notifications.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/notifications.oxi	1580
/code/branches/gui/data/levels/includes/notifications.oxi	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/notifications.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/notifications.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/notifications.oxi	6000-6023
/code/branches/input/data/levels/includes/notifications.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/notifications.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/notifications.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/notifications.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/notifications.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/notifications.oxi	7903-8175
/code/branches/libraries/data/levels/includes/notifications.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/notifications.oxi	5703-5737
/code/branches/lod/data/levels/includes/notifications.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/notifications.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/notifications.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/notifications.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/notifications.oxi	7502-7738
/code/branches/menu/data/levels/includes/notifications.oxi	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/notifications.oxi	2754-2824
/code/branches/netp2/data/levels/includes/notifications.oxi	2835-2988
/code/branches/netp3/data/levels/includes/notifications.oxi	2988-3082
/code/branches/netp6/data/levels/includes/notifications.oxi	3214-3302
/code/branches/network/data/levels/includes/notifications.oxi	2356
/code/branches/network2/data/levels/includes/notifications.oxi	6434-6465
/code/branches/network3/data/levels/includes/notifications.oxi	7196-7344
/code/branches/network4/data/levels/includes/notifications.oxi	7497-7755
/code/branches/network5/data/levels/includes/notifications.oxi	7757-7781
/code/branches/network6/data/levels/includes/notifications.oxi	7823-8315
/code/branches/network64/data/levels/includes/notifications.oxi	2210-2355
/code/branches/notifications/data/levels/includes/notifications.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/notifications.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/notifications.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/notifications.oxi	7506-7788
/code/branches/overlay/data/levels/includes/notifications.oxi	2117-2385
/code/branches/particles/data/levels/includes/notifications.oxi	2829-3085
/code/branches/particles2/data/levels/includes/notifications.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/notifications.oxi	3113-3194
/code/branches/physics/data/levels/includes/notifications.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/notifications.oxi	2436-2457
/code/branches/pickup/data/levels/includes/notifications.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/notifications.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/notifications.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/notifications.oxi	6594-6710
/code/branches/pickups/data/levels/includes/notifications.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/notifications.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/notifications.oxi	7262-7263
/code/branches/portals/data/levels/includes/notifications.oxi	8087-8455
/code/branches/portals2/data/levels/includes/notifications.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/notifications.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/notifications.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/notifications.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/notifications.oxi	7003-7089
/code/branches/presentation2/data/levels/includes/notifications.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/notifications.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/notifications.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/notifications.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/notifications.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/notifications.oxi	7614-7647
/code/branches/resource/data/levels/includes/notifications.oxi	3327-3366
/code/branches/resource2/data/levels/includes/notifications.oxi	3372-5694
/code/branches/rocket/data/levels/includes/notifications.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/notifications.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/notifications.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/notifications.oxi	6559-6989
/code/branches/sound/data/levels/includes/notifications.oxi	2829-3010
/code/branches/sound3/data/levels/includes/notifications.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/notifications.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/notifications.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/notifications.oxi	8182-8630
/code/branches/steering/data/levels/includes/notifications.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/notifications.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/notifications.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/notifications.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/notifications.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/notifications.oxi	8440-8716
/code/branches/usability/data/levels/includes/notifications.oxi	7915-8078
/code/branches/weapon/data/levels/includes/notifications.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/notifications.oxi	2107-2488
/code/branches/weapons/data/levels/includes/notifications.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/notifications.oxi	2742-2890

code/branches/presentation2012/data/levels/includes/pickups.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/environment3/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/formation/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/gamecontent/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/hud/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/menue/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/output/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/presentation/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/usability/data/levels/includes/pickups.oxi	merged	eligible
/code/trunk/data/levels/includes/pickups.oxi	merged	eligible
/code/branches/ai/data/levels/includes/pickups.oxi	6592-7033
/code/branches/ai2/data/levels/includes/pickups.oxi	8721-8880
/code/branches/bigships/data/levels/includes/pickups.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/pickups.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/pickups.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/pickups.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/pickups.oxi	1802-1808
/code/branches/chat/data/levels/includes/pickups.oxi	6527-6797
/code/branches/chat2/data/levels/includes/pickups.oxi	6836-6910
/code/branches/console/data/levels/includes/pickups.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/pickups.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/pickups.oxi	7178-7283
/code/branches/core3/data/levels/includes/pickups.oxi	1572-1739
/code/branches/core4/data/levels/includes/pickups.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/pickups.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/pickups.oxi	7537-7686
/code/branches/doc/data/levels/includes/pickups.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/pickups.oxi	8101-8192
/code/branches/dynamicmatch/data/levels/includes/pickups.oxi	6584-7030
/code/branches/fps/data/levels/includes/pickups.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/pickups.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/pickups.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/pickups.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/pickups.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/pickups.oxi	1580
/code/branches/gui/data/levels/includes/pickups.oxi	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/pickups.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/pickups.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/pickups.oxi	6000-6023
/code/branches/input/data/levels/includes/pickups.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/pickups.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/pickups.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/pickups.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/pickups.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/pickups.oxi	7903-8175
/code/branches/libraries/data/levels/includes/pickups.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/pickups.oxi	5703-5737
/code/branches/lod/data/levels/includes/pickups.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/pickups.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/pickups.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/pickups.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/pickups.oxi	7502-7738
/code/branches/menu/data/levels/includes/pickups.oxi	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/pickups.oxi	2754-2824
/code/branches/netp2/data/levels/includes/pickups.oxi	2835-2988
/code/branches/netp3/data/levels/includes/pickups.oxi	2988-3082
/code/branches/netp6/data/levels/includes/pickups.oxi	3214-3302
/code/branches/network/data/levels/includes/pickups.oxi	2356
/code/branches/network2/data/levels/includes/pickups.oxi	6434-6465
/code/branches/network3/data/levels/includes/pickups.oxi	7196-7344
/code/branches/network4/data/levels/includes/pickups.oxi	7497-7755
/code/branches/network5/data/levels/includes/pickups.oxi	7757-7781
/code/branches/network6/data/levels/includes/pickups.oxi	7823-8315
/code/branches/network64/data/levels/includes/pickups.oxi	2210-2355
/code/branches/notifications/data/levels/includes/pickups.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/pickups.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/pickups.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/pickups.oxi	7506-7788
/code/branches/overlay/data/levels/includes/pickups.oxi	2117-2385
/code/branches/particles/data/levels/includes/pickups.oxi	2829-3085
/code/branches/particles2/data/levels/includes/pickups.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/pickups.oxi	3113-3194
/code/branches/physics/data/levels/includes/pickups.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/pickups.oxi	2436-2457
/code/branches/pickup/data/levels/includes/pickups.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/pickups.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/pickups.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/pickups.oxi	6594-6710
/code/branches/pickups/data/levels/includes/pickups.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/pickups.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/pickups.oxi	7262-7263
/code/branches/portals/data/levels/includes/pickups.oxi	8087-8455
/code/branches/portals2/data/levels/includes/pickups.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/pickups.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/pickups.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/pickups.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/pickups.oxi	7003-7089
/code/branches/presentation2/data/levels/includes/pickups.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/pickups.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/pickups.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/pickups.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/pickups.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/pickups.oxi	7614-7647
/code/branches/resource/data/levels/includes/pickups.oxi	3327-3366
/code/branches/resource2/data/levels/includes/pickups.oxi	3372-5694
/code/branches/rocket/data/levels/includes/pickups.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/pickups.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/pickups.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/pickups.oxi	6559-6989
/code/branches/sound/data/levels/includes/pickups.oxi	2829-3010
/code/branches/sound3/data/levels/includes/pickups.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/pickups.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/pickups.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/pickups.oxi	8182-8630
/code/branches/steering/data/levels/includes/pickups.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/pickups.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/pickups.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/pickups.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/pickups.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/pickups.oxi	8440-8716
/code/branches/weapon/data/levels/includes/pickups.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/pickups.oxi	2107-2488
/code/branches/weapons/data/levels/includes/pickups.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/pickups.oxi	2742-2890

code/branches/presentation2012/data/levels/includes/weaponSettingsAssff.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/environment3/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/formation/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/gamecontent/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/hud/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/menue/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/output/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/usability/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/trunk/data/levels/includes/weaponSettingsAssff.oxi	merged	eligible
/code/branches/ai/data/levels/includes/weaponSettingsAssff.oxi	6592-7033
/code/branches/ai2/data/levels/includes/weaponSettingsAssff.oxi	8721-8880
/code/branches/bigships/data/levels/includes/weaponSettingsAssff.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/weaponSettingsAssff.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/weaponSettingsAssff.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/weaponSettingsAssff.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/weaponSettingsAssff.oxi	1802-1808
/code/branches/chat/data/levels/includes/weaponSettingsAssff.oxi	6527-6797
/code/branches/chat2/data/levels/includes/weaponSettingsAssff.oxi	6836-6910
/code/branches/console/data/levels/includes/weaponSettingsAssff.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/weaponSettingsAssff.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/weaponSettingsAssff.oxi	7178-7283
/code/branches/core3/data/levels/includes/weaponSettingsAssff.oxi	1572-1739
/code/branches/core4/data/levels/includes/weaponSettingsAssff.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/weaponSettingsAssff.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/weaponSettingsAssff.oxi	7537-7686
/code/branches/doc/data/levels/includes/weaponSettingsAssff.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/weaponSettingsAssff.oxi	8101-8192
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsAssff.oxi	6584-7030
/code/branches/fps/data/levels/includes/weaponSettingsAssff.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/weaponSettingsAssff.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/weaponSettingsAssff.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/weaponSettingsAssff.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/weaponSettingsAssff.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/weaponSettingsAssff.oxi	1580
/code/branches/gui/data/levels/includes/weaponSettingsAssff.oxi	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/weaponSettingsAssff.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/weaponSettingsAssff.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/weaponSettingsAssff.oxi	6000-6023
/code/branches/input/data/levels/includes/weaponSettingsAssff.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/weaponSettingsAssff.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/weaponSettingsAssff.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/weaponSettingsAssff.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/weaponSettingsAssff.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/weaponSettingsAssff.oxi	7903-8175
/code/branches/libraries/data/levels/includes/weaponSettingsAssff.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/weaponSettingsAssff.oxi	5703-5737
/code/branches/lod/data/levels/includes/weaponSettingsAssff.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/weaponSettingsAssff.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/weaponSettingsAssff.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/weaponSettingsAssff.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/weaponSettingsAssff.oxi	7502-7738
/code/branches/menu/data/levels/includes/weaponSettingsAssff.oxi	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/weaponSettingsAssff.oxi	2754-2824
/code/branches/netp2/data/levels/includes/weaponSettingsAssff.oxi	2835-2988
/code/branches/netp3/data/levels/includes/weaponSettingsAssff.oxi	2988-3082
/code/branches/netp6/data/levels/includes/weaponSettingsAssff.oxi	3214-3302
/code/branches/network/data/levels/includes/weaponSettingsAssff.oxi	2356
/code/branches/network2/data/levels/includes/weaponSettingsAssff.oxi	6434-6465
/code/branches/network3/data/levels/includes/weaponSettingsAssff.oxi	7196-7344
/code/branches/network4/data/levels/includes/weaponSettingsAssff.oxi	7497-7755
/code/branches/network5/data/levels/includes/weaponSettingsAssff.oxi	7757-7781
/code/branches/network6/data/levels/includes/weaponSettingsAssff.oxi	7823-8315
/code/branches/network64/data/levels/includes/weaponSettingsAssff.oxi	2210-2355
/code/branches/notifications/data/levels/includes/weaponSettingsAssff.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/weaponSettingsAssff.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/weaponSettingsAssff.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/weaponSettingsAssff.oxi	7506-7788
/code/branches/overlay/data/levels/includes/weaponSettingsAssff.oxi	2117-2385
/code/branches/particles/data/levels/includes/weaponSettingsAssff.oxi	2829-3085
/code/branches/particles2/data/levels/includes/weaponSettingsAssff.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/weaponSettingsAssff.oxi	3113-3194
/code/branches/physics/data/levels/includes/weaponSettingsAssff.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/weaponSettingsAssff.oxi	2436-2457
/code/branches/pickup/data/levels/includes/weaponSettingsAssff.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/weaponSettingsAssff.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/weaponSettingsAssff.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/weaponSettingsAssff.oxi	6594-6710
/code/branches/pickups/data/levels/includes/weaponSettingsAssff.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/weaponSettingsAssff.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/weaponSettingsAssff.oxi	7262-7263
/code/branches/portals/data/levels/includes/weaponSettingsAssff.oxi	8087-8455
/code/branches/portals2/data/levels/includes/weaponSettingsAssff.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/weaponSettingsAssff.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/weaponSettingsAssff.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/weaponSettingsAssff.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/weaponSettingsAssff.oxi	7003-7089
/code/branches/presentation2/data/levels/includes/weaponSettingsAssff.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/weaponSettingsAssff.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/weaponSettingsAssff.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/weaponSettingsAssff.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/weaponSettingsAssff.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/weaponSettingsAssff.oxi	7614-7647
/code/branches/resource/data/levels/includes/weaponSettingsAssff.oxi	3327-3366
/code/branches/resource2/data/levels/includes/weaponSettingsAssff.oxi	3372-5694
/code/branches/rocket/data/levels/includes/weaponSettingsAssff.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/weaponSettingsAssff.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/weaponSettingsAssff.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/weaponSettingsAssff.oxi	6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsAssff.oxi	2829-3010
/code/branches/sound3/data/levels/includes/weaponSettingsAssff.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/weaponSettingsAssff.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/weaponSettingsAssff.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/weaponSettingsAssff.oxi	8182-8630
/code/branches/steering/data/levels/includes/weaponSettingsAssff.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/weaponSettingsAssff.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/weaponSettingsAssff.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/weaponSettingsAssff.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/weaponSettingsAssff.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/weaponSettingsAssff.oxi	8440-8716
/code/branches/weapon/data/levels/includes/weaponSettingsAssff.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/weaponSettingsAssff.oxi	2107-2488
/code/branches/weapons/data/levels/includes/weaponSettingsAssff.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/weaponSettingsAssff.oxi	2742-2890

code/branches/presentation2012/data/levels/includes/weaponSettingsAssff2.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/formation/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/gamecontent/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/hud/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/menue/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/output/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/presentation/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/trunk/data/levels/includes/weaponSettingsAssff2.oxi	merged	eligible
/code/branches/ai/data/levels/includes/weaponSettingsAssff2.oxi	6592-7033
/code/branches/ai2/data/levels/includes/weaponSettingsAssff2.oxi	8721-8880
/code/branches/bigships/data/levels/includes/weaponSettingsAssff2.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/weaponSettingsAssff2.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/weaponSettingsAssff2.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/weaponSettingsAssff2.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/weaponSettingsAssff2.oxi	1802-1808
/code/branches/chat/data/levels/includes/weaponSettingsAssff2.oxi	6527-6797
/code/branches/chat2/data/levels/includes/weaponSettingsAssff2.oxi	6836-6910
/code/branches/console/data/levels/includes/weaponSettingsAssff2.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/weaponSettingsAssff2.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/weaponSettingsAssff2.oxi	7178-7283
/code/branches/core3/data/levels/includes/weaponSettingsAssff2.oxi	1572-1739
/code/branches/core4/data/levels/includes/weaponSettingsAssff2.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/weaponSettingsAssff2.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/weaponSettingsAssff2.oxi	7537-7686
/code/branches/doc/data/levels/includes/weaponSettingsAssff2.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/weaponSettingsAssff2.oxi	8101-8192
/code/branches/dockingsystem2/data/levels/includes/weaponSettingsAssff2.oxi	8196-8560
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsAssff2.oxi	6584-7030
/code/branches/fps/data/levels/includes/weaponSettingsAssff2.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/weaponSettingsAssff2.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/weaponSettingsAssff2.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/weaponSettingsAssff2.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/weaponSettingsAssff2.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/weaponSettingsAssff2.oxi	1580
/code/branches/gui/data/levels/includes/weaponSettingsAssff2.oxi	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/weaponSettingsAssff2.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/weaponSettingsAssff2.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/weaponSettingsAssff2.oxi	6000-6023
/code/branches/input/data/levels/includes/weaponSettingsAssff2.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/weaponSettingsAssff2.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/weaponSettingsAssff2.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/weaponSettingsAssff2.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/weaponSettingsAssff2.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/weaponSettingsAssff2.oxi	7903-8175
/code/branches/libraries/data/levels/includes/weaponSettingsAssff2.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/weaponSettingsAssff2.oxi	5703-5737
/code/branches/lod/data/levels/includes/weaponSettingsAssff2.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/weaponSettingsAssff2.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/weaponSettingsAssff2.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/weaponSettingsAssff2.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/weaponSettingsAssff2.oxi	7502-7738
/code/branches/menu/data/levels/includes/weaponSettingsAssff2.oxi	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/weaponSettingsAssff2.oxi	2754-2824
/code/branches/netp2/data/levels/includes/weaponSettingsAssff2.oxi	2835-2988
/code/branches/netp3/data/levels/includes/weaponSettingsAssff2.oxi	2988-3082
/code/branches/netp6/data/levels/includes/weaponSettingsAssff2.oxi	3214-3302
/code/branches/network/data/levels/includes/weaponSettingsAssff2.oxi	2356
/code/branches/network2/data/levels/includes/weaponSettingsAssff2.oxi	6434-6465
/code/branches/network3/data/levels/includes/weaponSettingsAssff2.oxi	7196-7344
/code/branches/network4/data/levels/includes/weaponSettingsAssff2.oxi	7497-7755
/code/branches/network5/data/levels/includes/weaponSettingsAssff2.oxi	7757-7781
/code/branches/network6/data/levels/includes/weaponSettingsAssff2.oxi	7823-8315
/code/branches/network64/data/levels/includes/weaponSettingsAssff2.oxi	2210-2355
/code/branches/notifications/data/levels/includes/weaponSettingsAssff2.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/weaponSettingsAssff2.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/weaponSettingsAssff2.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/weaponSettingsAssff2.oxi	7506-7788
/code/branches/overlay/data/levels/includes/weaponSettingsAssff2.oxi	2117-2385
/code/branches/particles/data/levels/includes/weaponSettingsAssff2.oxi	2829-3085
/code/branches/particles2/data/levels/includes/weaponSettingsAssff2.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/weaponSettingsAssff2.oxi	3113-3194
/code/branches/physics/data/levels/includes/weaponSettingsAssff2.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/weaponSettingsAssff2.oxi	2436-2457
/code/branches/pickup/data/levels/includes/weaponSettingsAssff2.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/weaponSettingsAssff2.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/weaponSettingsAssff2.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/weaponSettingsAssff2.oxi	6594-6710
/code/branches/pickups/data/levels/includes/weaponSettingsAssff2.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/weaponSettingsAssff2.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/weaponSettingsAssff2.oxi	7262-7263
/code/branches/portals/data/levels/includes/weaponSettingsAssff2.oxi	8087-8455
/code/branches/portals2/data/levels/includes/weaponSettingsAssff2.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/weaponSettingsAssff2.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/weaponSettingsAssff2.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/weaponSettingsAssff2.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/weaponSettingsAssff2.oxi	7003-7089
/code/branches/presentation2/data/levels/includes/weaponSettingsAssff2.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/weaponSettingsAssff2.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/weaponSettingsAssff2.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/weaponSettingsAssff2.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/weaponSettingsAssff2.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/weaponSettingsAssff2.oxi	7614-7647
/code/branches/resource/data/levels/includes/weaponSettingsAssff2.oxi	3327-3366
/code/branches/resource2/data/levels/includes/weaponSettingsAssff2.oxi	3372-5694
/code/branches/rocket/data/levels/includes/weaponSettingsAssff2.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/weaponSettingsAssff2.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/weaponSettingsAssff2.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/weaponSettingsAssff2.oxi	6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsAssff2.oxi	2829-3010
/code/branches/sound3/data/levels/includes/weaponSettingsAssff2.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/weaponSettingsAssff2.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/weaponSettingsAssff2.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/weaponSettingsAssff2.oxi	8182-8630
/code/branches/steering/data/levels/includes/weaponSettingsAssff2.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/weaponSettingsAssff2.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/weaponSettingsAssff2.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/weaponSettingsAssff2.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/weaponSettingsAssff2.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/weaponSettingsAssff2.oxi	8440-8716
/code/branches/usability/data/levels/includes/weaponSettingsAssff2.oxi	7915-8078
/code/branches/weapon/data/levels/includes/weaponSettingsAssff2.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/weaponSettingsAssff2.oxi	2107-2488
/code/branches/weapons/data/levels/includes/weaponSettingsAssff2.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/weaponSettingsAssff2.oxi	2742-2890

code/branches/presentation2012/data/levels/includes/weaponSettingsFPS.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/environment3/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/formation/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/gamecontent/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/hud/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/menue/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/output/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/presentation/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/usability/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/trunk/data/levels/includes/weaponSettingsFPS.oxi	merged	eligible
/code/branches/ai/data/levels/includes/weaponSettingsFPS.oxi	6592-7033
/code/branches/ai2/data/levels/includes/weaponSettingsFPS.oxi	8721-8880
/code/branches/bigships/data/levels/includes/weaponSettingsFPS.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/weaponSettingsFPS.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/weaponSettingsFPS.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/weaponSettingsFPS.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/weaponSettingsFPS.oxi	1802-1808
/code/branches/chat/data/levels/includes/weaponSettingsFPS.oxi	6527-6797
/code/branches/chat2/data/levels/includes/weaponSettingsFPS.oxi	6836-6910
/code/branches/console/data/levels/includes/weaponSettingsFPS.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/weaponSettingsFPS.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/weaponSettingsFPS.oxi	7178-7283
/code/branches/core3/data/levels/includes/weaponSettingsFPS.oxi	1572-1739
/code/branches/core4/data/levels/includes/weaponSettingsFPS.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/weaponSettingsFPS.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/weaponSettingsFPS.oxi	7537-7686
/code/branches/doc/data/levels/includes/weaponSettingsFPS.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/weaponSettingsFPS.oxi	8101-8192
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsFPS.oxi	6584-7030
/code/branches/fps/data/levels/includes/weaponSettingsFPS.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/weaponSettingsFPS.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/weaponSettingsFPS.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/weaponSettingsFPS.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/weaponSettingsFPS.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/weaponSettingsFPS.oxi	1580
/code/branches/gui/data/levels/includes/weaponSettingsFPS.oxi	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/weaponSettingsFPS.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/weaponSettingsFPS.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/weaponSettingsFPS.oxi	6000-6023
/code/branches/input/data/levels/includes/weaponSettingsFPS.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/weaponSettingsFPS.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/weaponSettingsFPS.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/weaponSettingsFPS.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/weaponSettingsFPS.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/weaponSettingsFPS.oxi	7903-8175
/code/branches/libraries/data/levels/includes/weaponSettingsFPS.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/weaponSettingsFPS.oxi	5703-5737
/code/branches/lod/data/levels/includes/weaponSettingsFPS.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/weaponSettingsFPS.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/weaponSettingsFPS.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/weaponSettingsFPS.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/weaponSettingsFPS.oxi	7502-7738
/code/branches/menu/data/levels/includes/weaponSettingsFPS.oxi	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/weaponSettingsFPS.oxi	2754-2824
/code/branches/netp2/data/levels/includes/weaponSettingsFPS.oxi	2835-2988
/code/branches/netp3/data/levels/includes/weaponSettingsFPS.oxi	2988-3082
/code/branches/netp6/data/levels/includes/weaponSettingsFPS.oxi	3214-3302
/code/branches/network/data/levels/includes/weaponSettingsFPS.oxi	2356
/code/branches/network2/data/levels/includes/weaponSettingsFPS.oxi	6434-6465
/code/branches/network3/data/levels/includes/weaponSettingsFPS.oxi	7196-7344
/code/branches/network4/data/levels/includes/weaponSettingsFPS.oxi	7497-7755
/code/branches/network5/data/levels/includes/weaponSettingsFPS.oxi	7757-7781
/code/branches/network6/data/levels/includes/weaponSettingsFPS.oxi	7823-8315
/code/branches/network64/data/levels/includes/weaponSettingsFPS.oxi	2210-2355
/code/branches/notifications/data/levels/includes/weaponSettingsFPS.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/weaponSettingsFPS.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/weaponSettingsFPS.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/weaponSettingsFPS.oxi	7506-7788
/code/branches/overlay/data/levels/includes/weaponSettingsFPS.oxi	2117-2385
/code/branches/particles/data/levels/includes/weaponSettingsFPS.oxi	2829-3085
/code/branches/particles2/data/levels/includes/weaponSettingsFPS.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/weaponSettingsFPS.oxi	3113-3194
/code/branches/physics/data/levels/includes/weaponSettingsFPS.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/weaponSettingsFPS.oxi	2436-2457
/code/branches/pickup/data/levels/includes/weaponSettingsFPS.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/weaponSettingsFPS.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/weaponSettingsFPS.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/weaponSettingsFPS.oxi	6594-6710
/code/branches/pickups/data/levels/includes/weaponSettingsFPS.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/weaponSettingsFPS.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/weaponSettingsFPS.oxi	7262-7263
/code/branches/portals/data/levels/includes/weaponSettingsFPS.oxi	8087-8455
/code/branches/portals2/data/levels/includes/weaponSettingsFPS.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/weaponSettingsFPS.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/weaponSettingsFPS.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/weaponSettingsFPS.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/weaponSettingsFPS.oxi	7003-7089
/code/branches/presentation2/data/levels/includes/weaponSettingsFPS.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/weaponSettingsFPS.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/weaponSettingsFPS.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/weaponSettingsFPS.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/weaponSettingsFPS.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/weaponSettingsFPS.oxi	7614-7647
/code/branches/resource/data/levels/includes/weaponSettingsFPS.oxi	3327-3366
/code/branches/resource2/data/levels/includes/weaponSettingsFPS.oxi	3372-5694
/code/branches/rocket/data/levels/includes/weaponSettingsFPS.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/weaponSettingsFPS.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/weaponSettingsFPS.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/weaponSettingsFPS.oxi	6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsFPS.oxi	2829-3010
/code/branches/sound3/data/levels/includes/weaponSettingsFPS.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/weaponSettingsFPS.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/weaponSettingsFPS.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/weaponSettingsFPS.oxi	8182-8630
/code/branches/steering/data/levels/includes/weaponSettingsFPS.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/weaponSettingsFPS.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/weaponSettingsFPS.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/weaponSettingsFPS.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/weaponSettingsFPS.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/weaponSettingsFPS.oxi	8440-8716
/code/branches/weapon/data/levels/includes/weaponSettingsFPS.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/weaponSettingsFPS.oxi	2107-2488
/code/branches/weapons/data/levels/includes/weaponSettingsFPS.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/weaponSettingsFPS.oxi	2742-2890

code/branches/presentation2012/data/levels/includes/weaponSettingsGhost.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/environment3/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/formation/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/gamecontent/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/hud/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/menue/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/output/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/presentation/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/usability/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/trunk/data/levels/includes/weaponSettingsGhost.oxi	merged	eligible
/code/branches/ai/data/levels/includes/weaponSettingsGhost.oxi	6592-7033
/code/branches/ai2/data/levels/includes/weaponSettingsGhost.oxi	8721-8880
/code/branches/bigships/data/levels/includes/weaponSettingsGhost.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/weaponSettingsGhost.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/weaponSettingsGhost.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/weaponSettingsGhost.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/weaponSettingsGhost.oxi	1802-1808
/code/branches/chat/data/levels/includes/weaponSettingsGhost.oxi	6527-6797
/code/branches/chat2/data/levels/includes/weaponSettingsGhost.oxi	6836-6910
/code/branches/console/data/levels/includes/weaponSettingsGhost.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/weaponSettingsGhost.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/weaponSettingsGhost.oxi	7178-7283
/code/branches/core3/data/levels/includes/weaponSettingsGhost.oxi	1572-1739
/code/branches/core4/data/levels/includes/weaponSettingsGhost.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/weaponSettingsGhost.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/weaponSettingsGhost.oxi	7537-7686
/code/branches/doc/data/levels/includes/weaponSettingsGhost.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/weaponSettingsGhost.oxi	8101-8192
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsGhost.oxi	6584-7030
/code/branches/fps/data/levels/includes/weaponSettingsGhost.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/weaponSettingsGhost.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/weaponSettingsGhost.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/weaponSettingsGhost.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/weaponSettingsGhost.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/weaponSettingsGhost.oxi	1580
/code/branches/gui/data/levels/includes/weaponSettingsGhost.oxi	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/weaponSettingsGhost.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/weaponSettingsGhost.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/weaponSettingsGhost.oxi	6000-6023
/code/branches/input/data/levels/includes/weaponSettingsGhost.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/weaponSettingsGhost.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/weaponSettingsGhost.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/weaponSettingsGhost.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/weaponSettingsGhost.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/weaponSettingsGhost.oxi	7903-8175
/code/branches/libraries/data/levels/includes/weaponSettingsGhost.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/weaponSettingsGhost.oxi	5703-5737
/code/branches/lod/data/levels/includes/weaponSettingsGhost.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/weaponSettingsGhost.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/weaponSettingsGhost.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/weaponSettingsGhost.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/weaponSettingsGhost.oxi	7502-7738
/code/branches/menu/data/levels/includes/weaponSettingsGhost.oxi	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/weaponSettingsGhost.oxi	2754-2824
/code/branches/netp2/data/levels/includes/weaponSettingsGhost.oxi	2835-2988
/code/branches/netp3/data/levels/includes/weaponSettingsGhost.oxi	2988-3082
/code/branches/netp6/data/levels/includes/weaponSettingsGhost.oxi	3214-3302
/code/branches/network/data/levels/includes/weaponSettingsGhost.oxi	2356
/code/branches/network2/data/levels/includes/weaponSettingsGhost.oxi	6434-6465
/code/branches/network3/data/levels/includes/weaponSettingsGhost.oxi	7196-7344
/code/branches/network4/data/levels/includes/weaponSettingsGhost.oxi	7497-7755
/code/branches/network5/data/levels/includes/weaponSettingsGhost.oxi	7757-7781
/code/branches/network6/data/levels/includes/weaponSettingsGhost.oxi	7823-8315
/code/branches/network64/data/levels/includes/weaponSettingsGhost.oxi	2210-2355
/code/branches/notifications/data/levels/includes/weaponSettingsGhost.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/weaponSettingsGhost.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/weaponSettingsGhost.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/weaponSettingsGhost.oxi	7506-7788
/code/branches/overlay/data/levels/includes/weaponSettingsGhost.oxi	2117-2385
/code/branches/particles/data/levels/includes/weaponSettingsGhost.oxi	2829-3085
/code/branches/particles2/data/levels/includes/weaponSettingsGhost.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/weaponSettingsGhost.oxi	3113-3194
/code/branches/physics/data/levels/includes/weaponSettingsGhost.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/weaponSettingsGhost.oxi	2436-2457
/code/branches/pickup/data/levels/includes/weaponSettingsGhost.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/weaponSettingsGhost.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/weaponSettingsGhost.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/weaponSettingsGhost.oxi	6594-6710
/code/branches/pickups/data/levels/includes/weaponSettingsGhost.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/weaponSettingsGhost.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/weaponSettingsGhost.oxi	7262-7263
/code/branches/portals/data/levels/includes/weaponSettingsGhost.oxi	8087-8455
/code/branches/portals2/data/levels/includes/weaponSettingsGhost.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/weaponSettingsGhost.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/weaponSettingsGhost.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/weaponSettingsGhost.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/weaponSettingsGhost.oxi	7003-7089
/code/branches/presentation2/data/levels/includes/weaponSettingsGhost.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/weaponSettingsGhost.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/weaponSettingsGhost.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/weaponSettingsGhost.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/weaponSettingsGhost.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/weaponSettingsGhost.oxi	7614-7647
/code/branches/resource/data/levels/includes/weaponSettingsGhost.oxi	3327-3366
/code/branches/resource2/data/levels/includes/weaponSettingsGhost.oxi	3372-5694
/code/branches/rocket/data/levels/includes/weaponSettingsGhost.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/weaponSettingsGhost.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/weaponSettingsGhost.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/weaponSettingsGhost.oxi	6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsGhost.oxi	2829-3010
/code/branches/sound3/data/levels/includes/weaponSettingsGhost.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/weaponSettingsGhost.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/weaponSettingsGhost.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/weaponSettingsGhost.oxi	8182-8630
/code/branches/steering/data/levels/includes/weaponSettingsGhost.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/weaponSettingsGhost.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/weaponSettingsGhost.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/weaponSettingsGhost.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/weaponSettingsGhost.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/weaponSettingsGhost.oxi	8440-8716
/code/branches/weapon/data/levels/includes/weaponSettingsGhost.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/weaponSettingsGhost.oxi	2107-2488
/code/branches/weapons/data/levels/includes/weaponSettingsGhost.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/weaponSettingsGhost.oxi	2742-2890

code/branches/presentation2012/data/levels/includes/weaponSettingsH2.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/environment3/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/formation/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/gamecontent/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/hud/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/menue/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/output/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/presentation/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/usability/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/trunk/data/levels/includes/weaponSettingsH2.oxi	merged	eligible
/code/branches/ai/data/levels/includes/weaponSettingsH2.oxi	6592-7033
/code/branches/ai2/data/levels/includes/weaponSettingsH2.oxi	8721-8880
/code/branches/bigships/data/levels/includes/weaponSettingsH2.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/weaponSettingsH2.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/weaponSettingsH2.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/weaponSettingsH2.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/weaponSettingsH2.oxi	1802-1808
/code/branches/chat/data/levels/includes/weaponSettingsH2.oxi	6527-6797
/code/branches/chat2/data/levels/includes/weaponSettingsH2.oxi	6836-6910
/code/branches/console/data/levels/includes/weaponSettingsH2.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/weaponSettingsH2.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/weaponSettingsH2.oxi	7178-7283
/code/branches/core3/data/levels/includes/weaponSettingsH2.oxi	1572-1739
/code/branches/core4/data/levels/includes/weaponSettingsH2.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/weaponSettingsH2.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/weaponSettingsH2.oxi	7537-7686
/code/branches/doc/data/levels/includes/weaponSettingsH2.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/weaponSettingsH2.oxi	8101-8192
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsH2.oxi	6584-7030
/code/branches/fps/data/levels/includes/weaponSettingsH2.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/weaponSettingsH2.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/weaponSettingsH2.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/weaponSettingsH2.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/weaponSettingsH2.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/weaponSettingsH2.oxi	1580
/code/branches/gui/data/levels/includes/weaponSettingsH2.oxi	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/weaponSettingsH2.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/weaponSettingsH2.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/weaponSettingsH2.oxi	6000-6023
/code/branches/input/data/levels/includes/weaponSettingsH2.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/weaponSettingsH2.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/weaponSettingsH2.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/weaponSettingsH2.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/weaponSettingsH2.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/weaponSettingsH2.oxi	7903-8175
/code/branches/libraries/data/levels/includes/weaponSettingsH2.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/weaponSettingsH2.oxi	5703-5737
/code/branches/lod/data/levels/includes/weaponSettingsH2.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/weaponSettingsH2.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/weaponSettingsH2.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/weaponSettingsH2.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/weaponSettingsH2.oxi	7502-7738
/code/branches/menu/data/levels/includes/weaponSettingsH2.oxi	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/weaponSettingsH2.oxi	2754-2824
/code/branches/netp2/data/levels/includes/weaponSettingsH2.oxi	2835-2988
/code/branches/netp3/data/levels/includes/weaponSettingsH2.oxi	2988-3082
/code/branches/netp6/data/levels/includes/weaponSettingsH2.oxi	3214-3302
/code/branches/network/data/levels/includes/weaponSettingsH2.oxi	2356
/code/branches/network2/data/levels/includes/weaponSettingsH2.oxi	6434-6465
/code/branches/network3/data/levels/includes/weaponSettingsH2.oxi	7196-7344
/code/branches/network4/data/levels/includes/weaponSettingsH2.oxi	7497-7755
/code/branches/network5/data/levels/includes/weaponSettingsH2.oxi	7757-7781
/code/branches/network6/data/levels/includes/weaponSettingsH2.oxi	7823-8315
/code/branches/network64/data/levels/includes/weaponSettingsH2.oxi	2210-2355
/code/branches/notifications/data/levels/includes/weaponSettingsH2.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/weaponSettingsH2.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/weaponSettingsH2.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/weaponSettingsH2.oxi	7506-7788
/code/branches/overlay/data/levels/includes/weaponSettingsH2.oxi	2117-2385
/code/branches/particles/data/levels/includes/weaponSettingsH2.oxi	2829-3085
/code/branches/particles2/data/levels/includes/weaponSettingsH2.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/weaponSettingsH2.oxi	3113-3194
/code/branches/physics/data/levels/includes/weaponSettingsH2.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/weaponSettingsH2.oxi	2436-2457
/code/branches/pickup/data/levels/includes/weaponSettingsH2.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/weaponSettingsH2.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/weaponSettingsH2.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/weaponSettingsH2.oxi	6594-6710
/code/branches/pickups/data/levels/includes/weaponSettingsH2.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/weaponSettingsH2.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/weaponSettingsH2.oxi	7262-7263
/code/branches/portals/data/levels/includes/weaponSettingsH2.oxi	8087-8455
/code/branches/portals2/data/levels/includes/weaponSettingsH2.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/weaponSettingsH2.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/weaponSettingsH2.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/weaponSettingsH2.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/weaponSettingsH2.oxi	7003-7089
/code/branches/presentation2/data/levels/includes/weaponSettingsH2.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/weaponSettingsH2.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/weaponSettingsH2.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/weaponSettingsH2.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/weaponSettingsH2.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/weaponSettingsH2.oxi	7614-7647
/code/branches/resource/data/levels/includes/weaponSettingsH2.oxi	3327-3366
/code/branches/resource2/data/levels/includes/weaponSettingsH2.oxi	3372-5694
/code/branches/rocket/data/levels/includes/weaponSettingsH2.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/weaponSettingsH2.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/weaponSettingsH2.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/weaponSettingsH2.oxi	6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsH2.oxi	2829-3010
/code/branches/sound3/data/levels/includes/weaponSettingsH2.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/weaponSettingsH2.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/weaponSettingsH2.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/weaponSettingsH2.oxi	8182-8630
/code/branches/steering/data/levels/includes/weaponSettingsH2.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/weaponSettingsH2.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/weaponSettingsH2.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/weaponSettingsH2.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/weaponSettingsH2.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/weaponSettingsH2.oxi	8440-8716
/code/branches/weapon/data/levels/includes/weaponSettingsH2.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/weaponSettingsH2.oxi	2107-2488
/code/branches/weapons/data/levels/includes/weaponSettingsH2.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/weaponSettingsH2.oxi	2742-2890

code/branches/presentation2012/data/levels/includes/weaponSettingsHXY.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/environment3/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/formation/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/gamecontent/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/hud/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/menue/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/output/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/presentation/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/usability/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/trunk/data/levels/includes/weaponSettingsHXY.oxi	merged	eligible
/code/branches/ai/data/levels/includes/weaponSettingsHXY.oxi	6592-7033
/code/branches/ai2/data/levels/includes/weaponSettingsHXY.oxi	8721-8880
/code/branches/bigships/data/levels/includes/weaponSettingsHXY.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/weaponSettingsHXY.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/weaponSettingsHXY.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/weaponSettingsHXY.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/weaponSettingsHXY.oxi	1802-1808
/code/branches/chat/data/levels/includes/weaponSettingsHXY.oxi	6527-6797
/code/branches/chat2/data/levels/includes/weaponSettingsHXY.oxi	6836-6910
/code/branches/console/data/levels/includes/weaponSettingsHXY.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/weaponSettingsHXY.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/weaponSettingsHXY.oxi	7178-7283
/code/branches/core3/data/levels/includes/weaponSettingsHXY.oxi	1572-1739
/code/branches/core4/data/levels/includes/weaponSettingsHXY.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/weaponSettingsHXY.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/weaponSettingsHXY.oxi	7537-7686
/code/branches/doc/data/levels/includes/weaponSettingsHXY.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/weaponSettingsHXY.oxi	8101-8192
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsHXY.oxi	6584-7030
/code/branches/fps/data/levels/includes/weaponSettingsHXY.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/weaponSettingsHXY.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/weaponSettingsHXY.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/weaponSettingsHXY.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/weaponSettingsHXY.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/weaponSettingsHXY.oxi	1580
/code/branches/gui/data/levels/includes/weaponSettingsHXY.oxi	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/weaponSettingsHXY.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/weaponSettingsHXY.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/weaponSettingsHXY.oxi	6000-6023
/code/branches/input/data/levels/includes/weaponSettingsHXY.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/weaponSettingsHXY.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/weaponSettingsHXY.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/weaponSettingsHXY.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/weaponSettingsHXY.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/weaponSettingsHXY.oxi	7903-8175
/code/branches/libraries/data/levels/includes/weaponSettingsHXY.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/weaponSettingsHXY.oxi	5703-5737
/code/branches/lod/data/levels/includes/weaponSettingsHXY.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/weaponSettingsHXY.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/weaponSettingsHXY.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/weaponSettingsHXY.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/weaponSettingsHXY.oxi	7502-7738
/code/branches/menu/data/levels/includes/weaponSettingsHXY.oxi	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/weaponSettingsHXY.oxi	2754-2824
/code/branches/netp2/data/levels/includes/weaponSettingsHXY.oxi	2835-2988
/code/branches/netp3/data/levels/includes/weaponSettingsHXY.oxi	2988-3082
/code/branches/netp6/data/levels/includes/weaponSettingsHXY.oxi	3214-3302
/code/branches/network/data/levels/includes/weaponSettingsHXY.oxi	2356
/code/branches/network2/data/levels/includes/weaponSettingsHXY.oxi	6434-6465
/code/branches/network3/data/levels/includes/weaponSettingsHXY.oxi	7196-7344
/code/branches/network4/data/levels/includes/weaponSettingsHXY.oxi	7497-7755
/code/branches/network5/data/levels/includes/weaponSettingsHXY.oxi	7757-7781
/code/branches/network6/data/levels/includes/weaponSettingsHXY.oxi	7823-8315
/code/branches/network64/data/levels/includes/weaponSettingsHXY.oxi	2210-2355
/code/branches/notifications/data/levels/includes/weaponSettingsHXY.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/weaponSettingsHXY.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/weaponSettingsHXY.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/weaponSettingsHXY.oxi	7506-7788
/code/branches/overlay/data/levels/includes/weaponSettingsHXY.oxi	2117-2385
/code/branches/particles/data/levels/includes/weaponSettingsHXY.oxi	2829-3085
/code/branches/particles2/data/levels/includes/weaponSettingsHXY.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/weaponSettingsHXY.oxi	3113-3194
/code/branches/physics/data/levels/includes/weaponSettingsHXY.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/weaponSettingsHXY.oxi	2436-2457
/code/branches/pickup/data/levels/includes/weaponSettingsHXY.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/weaponSettingsHXY.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/weaponSettingsHXY.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/weaponSettingsHXY.oxi	6594-6710
/code/branches/pickups/data/levels/includes/weaponSettingsHXY.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/weaponSettingsHXY.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/weaponSettingsHXY.oxi	7262-7263
/code/branches/portals/data/levels/includes/weaponSettingsHXY.oxi	8087-8455
/code/branches/portals2/data/levels/includes/weaponSettingsHXY.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/weaponSettingsHXY.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/weaponSettingsHXY.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/weaponSettingsHXY.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/weaponSettingsHXY.oxi	7003-7089
/code/branches/presentation2/data/levels/includes/weaponSettingsHXY.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/weaponSettingsHXY.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/weaponSettingsHXY.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/weaponSettingsHXY.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/weaponSettingsHXY.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/weaponSettingsHXY.oxi	7614-7647
/code/branches/resource/data/levels/includes/weaponSettingsHXY.oxi	3327-3366
/code/branches/resource2/data/levels/includes/weaponSettingsHXY.oxi	3372-5694
/code/branches/rocket/data/levels/includes/weaponSettingsHXY.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/weaponSettingsHXY.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/weaponSettingsHXY.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/weaponSettingsHXY.oxi	6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsHXY.oxi	2829-3010
/code/branches/sound3/data/levels/includes/weaponSettingsHXY.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/weaponSettingsHXY.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/weaponSettingsHXY.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/weaponSettingsHXY.oxi	8182-8630
/code/branches/steering/data/levels/includes/weaponSettingsHXY.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/weaponSettingsHXY.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/weaponSettingsHXY.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/weaponSettingsHXY.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/weaponSettingsHXY.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/weaponSettingsHXY.oxi	8440-8716
/code/branches/weapon/data/levels/includes/weaponSettingsHXY.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/weaponSettingsHXY.oxi	2107-2488
/code/branches/weapons/data/levels/includes/weaponSettingsHXY.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/weaponSettingsHXY.oxi	2742-2890

code/branches/presentation2012/data/levels/includes/weaponSettingsImmTest.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/formation/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/gamecontent/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/hud/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/menue/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/output/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/trunk/data/levels/includes/weaponSettingsImmTest.oxi	merged	eligible
/code/branches/ai/data/levels/includes/weaponSettingsImmTest.oxi	6592-7033
/code/branches/ai2/data/levels/includes/weaponSettingsImmTest.oxi	8721-8880
/code/branches/bigships/data/levels/includes/weaponSettingsImmTest.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/weaponSettingsImmTest.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/weaponSettingsImmTest.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/weaponSettingsImmTest.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/weaponSettingsImmTest.oxi	1802-1808
/code/branches/chat/data/levels/includes/weaponSettingsImmTest.oxi	6527-6797
/code/branches/chat2/data/levels/includes/weaponSettingsImmTest.oxi	6836-6910
/code/branches/console/data/levels/includes/weaponSettingsImmTest.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/weaponSettingsImmTest.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/weaponSettingsImmTest.oxi	7178-7283
/code/branches/core3/data/levels/includes/weaponSettingsImmTest.oxi	1572-1739
/code/branches/core4/data/levels/includes/weaponSettingsImmTest.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/weaponSettingsImmTest.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/weaponSettingsImmTest.oxi	7537-7686
/code/branches/doc/data/levels/includes/weaponSettingsImmTest.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/weaponSettingsImmTest.oxi	8101-8192
/code/branches/dockingsystem2/data/levels/includes/weaponSettingsImmTest.oxi	8196-8560
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsImmTest.oxi	6584-7030
/code/branches/fps/data/levels/includes/weaponSettingsImmTest.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/weaponSettingsImmTest.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/weaponSettingsImmTest.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/weaponSettingsImmTest.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/weaponSettingsImmTest.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/weaponSettingsImmTest.oxi	1580
/code/branches/gui/data/levels/includes/weaponSettingsImmTest.oxi	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/weaponSettingsImmTest.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/weaponSettingsImmTest.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/weaponSettingsImmTest.oxi	6000-6023
/code/branches/input/data/levels/includes/weaponSettingsImmTest.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/weaponSettingsImmTest.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/weaponSettingsImmTest.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/weaponSettingsImmTest.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/weaponSettingsImmTest.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/weaponSettingsImmTest.oxi	7903-8175
/code/branches/libraries/data/levels/includes/weaponSettingsImmTest.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/weaponSettingsImmTest.oxi	5703-5737
/code/branches/lod/data/levels/includes/weaponSettingsImmTest.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/weaponSettingsImmTest.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/weaponSettingsImmTest.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/weaponSettingsImmTest.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/weaponSettingsImmTest.oxi	7502-7738
/code/branches/menu/data/levels/includes/weaponSettingsImmTest.oxi	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/weaponSettingsImmTest.oxi	2754-2824
/code/branches/netp2/data/levels/includes/weaponSettingsImmTest.oxi	2835-2988
/code/branches/netp3/data/levels/includes/weaponSettingsImmTest.oxi	2988-3082
/code/branches/netp6/data/levels/includes/weaponSettingsImmTest.oxi	3214-3302
/code/branches/network/data/levels/includes/weaponSettingsImmTest.oxi	2356
/code/branches/network2/data/levels/includes/weaponSettingsImmTest.oxi	6434-6465
/code/branches/network3/data/levels/includes/weaponSettingsImmTest.oxi	7196-7344
/code/branches/network4/data/levels/includes/weaponSettingsImmTest.oxi	7497-7755
/code/branches/network5/data/levels/includes/weaponSettingsImmTest.oxi	7757-7781
/code/branches/network6/data/levels/includes/weaponSettingsImmTest.oxi	7823-8315
/code/branches/network64/data/levels/includes/weaponSettingsImmTest.oxi	2210-2355
/code/branches/notifications/data/levels/includes/weaponSettingsImmTest.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/weaponSettingsImmTest.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/weaponSettingsImmTest.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/weaponSettingsImmTest.oxi	7506-7788
/code/branches/overlay/data/levels/includes/weaponSettingsImmTest.oxi	2117-2385
/code/branches/particles/data/levels/includes/weaponSettingsImmTest.oxi	2829-3085
/code/branches/particles2/data/levels/includes/weaponSettingsImmTest.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/weaponSettingsImmTest.oxi	3113-3194
/code/branches/physics/data/levels/includes/weaponSettingsImmTest.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/weaponSettingsImmTest.oxi	2436-2457
/code/branches/pickup/data/levels/includes/weaponSettingsImmTest.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/weaponSettingsImmTest.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/weaponSettingsImmTest.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/weaponSettingsImmTest.oxi	6594-6710
/code/branches/pickups/data/levels/includes/weaponSettingsImmTest.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/weaponSettingsImmTest.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/weaponSettingsImmTest.oxi	7262-7263
/code/branches/portals/data/levels/includes/weaponSettingsImmTest.oxi	8087-8455
/code/branches/portals2/data/levels/includes/weaponSettingsImmTest.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/weaponSettingsImmTest.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/weaponSettingsImmTest.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/weaponSettingsImmTest.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/weaponSettingsImmTest.oxi	7003-7089
/code/branches/presentation2/data/levels/includes/weaponSettingsImmTest.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/weaponSettingsImmTest.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/weaponSettingsImmTest.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/weaponSettingsImmTest.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/weaponSettingsImmTest.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/weaponSettingsImmTest.oxi	7614-7647
/code/branches/resource/data/levels/includes/weaponSettingsImmTest.oxi	3327-3366
/code/branches/resource2/data/levels/includes/weaponSettingsImmTest.oxi	3372-5694
/code/branches/rocket/data/levels/includes/weaponSettingsImmTest.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/weaponSettingsImmTest.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/weaponSettingsImmTest.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/weaponSettingsImmTest.oxi	6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsImmTest.oxi	2829-3010
/code/branches/sound3/data/levels/includes/weaponSettingsImmTest.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/weaponSettingsImmTest.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/weaponSettingsImmTest.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/weaponSettingsImmTest.oxi	8182-8630
/code/branches/steering/data/levels/includes/weaponSettingsImmTest.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/weaponSettingsImmTest.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/weaponSettingsImmTest.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/weaponSettingsImmTest.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/weaponSettingsImmTest.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/weaponSettingsImmTest.oxi	8440-8716
/code/branches/usability/data/levels/includes/weaponSettingsImmTest.oxi	7915-8078
/code/branches/weapon/data/levels/includes/weaponSettingsImmTest.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/weaponSettingsImmTest.oxi	2107-2488
/code/branches/weapons/data/levels/includes/weaponSettingsImmTest.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/weaponSettingsImmTest.oxi	2742-2890

code/branches/presentation2012/data/levels/includes/weaponSettingsPirate.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/environment3/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/formation/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/gamecontent/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/hud/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/menue/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/output/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/presentation/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/usability/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/trunk/data/levels/includes/weaponSettingsPirate.oxi	merged	eligible
/code/branches/ai/data/levels/includes/weaponSettingsPirate.oxi	6592-7033
/code/branches/ai2/data/levels/includes/weaponSettingsPirate.oxi	8721-8880
/code/branches/bigships/data/levels/includes/weaponSettingsPirate.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/weaponSettingsPirate.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/weaponSettingsPirate.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/weaponSettingsPirate.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/weaponSettingsPirate.oxi	1802-1808
/code/branches/chat/data/levels/includes/weaponSettingsPirate.oxi	6527-6797
/code/branches/chat2/data/levels/includes/weaponSettingsPirate.oxi	6836-6910
/code/branches/console/data/levels/includes/weaponSettingsPirate.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/weaponSettingsPirate.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/weaponSettingsPirate.oxi	7178-7283
/code/branches/core3/data/levels/includes/weaponSettingsPirate.oxi	1572-1739
/code/branches/core4/data/levels/includes/weaponSettingsPirate.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/weaponSettingsPirate.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/weaponSettingsPirate.oxi	7537-7686
/code/branches/doc/data/levels/includes/weaponSettingsPirate.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/weaponSettingsPirate.oxi	8101-8192
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsPirate.oxi	6584-7030
/code/branches/fps/data/levels/includes/weaponSettingsPirate.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/weaponSettingsPirate.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/weaponSettingsPirate.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/weaponSettingsPirate.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/weaponSettingsPirate.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/weaponSettingsPirate.oxi	1580
/code/branches/gui/data/levels/includes/weaponSettingsPirate.oxi	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/weaponSettingsPirate.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/weaponSettingsPirate.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/weaponSettingsPirate.oxi	6000-6023
/code/branches/input/data/levels/includes/weaponSettingsPirate.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/weaponSettingsPirate.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/weaponSettingsPirate.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/weaponSettingsPirate.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/weaponSettingsPirate.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/weaponSettingsPirate.oxi	7903-8175
/code/branches/libraries/data/levels/includes/weaponSettingsPirate.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/weaponSettingsPirate.oxi	5703-5737
/code/branches/lod/data/levels/includes/weaponSettingsPirate.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/weaponSettingsPirate.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/weaponSettingsPirate.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/weaponSettingsPirate.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/weaponSettingsPirate.oxi	7502-7738
/code/branches/menu/data/levels/includes/weaponSettingsPirate.oxi	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/weaponSettingsPirate.oxi	2754-2824
/code/branches/netp2/data/levels/includes/weaponSettingsPirate.oxi	2835-2988
/code/branches/netp3/data/levels/includes/weaponSettingsPirate.oxi	2988-3082
/code/branches/netp6/data/levels/includes/weaponSettingsPirate.oxi	3214-3302
/code/branches/network/data/levels/includes/weaponSettingsPirate.oxi	2356
/code/branches/network2/data/levels/includes/weaponSettingsPirate.oxi	6434-6465
/code/branches/network3/data/levels/includes/weaponSettingsPirate.oxi	7196-7344
/code/branches/network4/data/levels/includes/weaponSettingsPirate.oxi	7497-7755
/code/branches/network5/data/levels/includes/weaponSettingsPirate.oxi	7757-7781
/code/branches/network6/data/levels/includes/weaponSettingsPirate.oxi	7823-8315
/code/branches/network64/data/levels/includes/weaponSettingsPirate.oxi	2210-2355
/code/branches/notifications/data/levels/includes/weaponSettingsPirate.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/weaponSettingsPirate.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/weaponSettingsPirate.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/weaponSettingsPirate.oxi	7506-7788
/code/branches/overlay/data/levels/includes/weaponSettingsPirate.oxi	2117-2385
/code/branches/particles/data/levels/includes/weaponSettingsPirate.oxi	2829-3085
/code/branches/particles2/data/levels/includes/weaponSettingsPirate.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/weaponSettingsPirate.oxi	3113-3194
/code/branches/physics/data/levels/includes/weaponSettingsPirate.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/weaponSettingsPirate.oxi	2436-2457
/code/branches/pickup/data/levels/includes/weaponSettingsPirate.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/weaponSettingsPirate.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/weaponSettingsPirate.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/weaponSettingsPirate.oxi	6594-6710
/code/branches/pickups/data/levels/includes/weaponSettingsPirate.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/weaponSettingsPirate.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/weaponSettingsPirate.oxi	7262-7263
/code/branches/portals/data/levels/includes/weaponSettingsPirate.oxi	8087-8455
/code/branches/portals2/data/levels/includes/weaponSettingsPirate.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/weaponSettingsPirate.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/weaponSettingsPirate.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/weaponSettingsPirate.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/weaponSettingsPirate.oxi	7003-7089
/code/branches/presentation2/data/levels/includes/weaponSettingsPirate.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/weaponSettingsPirate.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/weaponSettingsPirate.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/weaponSettingsPirate.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/weaponSettingsPirate.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/weaponSettingsPirate.oxi	7614-7647
/code/branches/resource/data/levels/includes/weaponSettingsPirate.oxi	3327-3366
/code/branches/resource2/data/levels/includes/weaponSettingsPirate.oxi	3372-5694
/code/branches/rocket/data/levels/includes/weaponSettingsPirate.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/weaponSettingsPirate.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/weaponSettingsPirate.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/weaponSettingsPirate.oxi	6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsPirate.oxi	2829-3010
/code/branches/sound3/data/levels/includes/weaponSettingsPirate.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/weaponSettingsPirate.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/weaponSettingsPirate.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/weaponSettingsPirate.oxi	8182-8630
/code/branches/steering/data/levels/includes/weaponSettingsPirate.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/weaponSettingsPirate.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/weaponSettingsPirate.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/weaponSettingsPirate.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/weaponSettingsPirate.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/weaponSettingsPirate.oxi	8440-8716
/code/branches/weapon/data/levels/includes/weaponSettingsPirate.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/weaponSettingsPirate.oxi	2107-2488
/code/branches/weapons/data/levels/includes/weaponSettingsPirate.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/weaponSettingsPirate.oxi	2742-2890

code/branches/presentation2012/data/levels/includes/weaponSettingsSpacecruiser.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/gamecontent/data/levels/includes/weaponSettingsSpacecruiser.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/weaponSettingsSpacecruiser.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/weaponSettingsSpacecruiser.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/weaponSettingsSpacecruiser.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/weaponSettingsSpacecruiser.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/weaponSettingsSpacecruiser.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/weaponSettingsSpacecruiser.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/weaponSettingsSpacecruiser.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/weaponSettingsSpacecruiser.oxi	merged	eligible
/code/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi	merged	eligible
/code/branches/ai/data/levels/includes/weaponSettingsSpacecruiser.oxi	6592-7033
/code/branches/ai2/data/levels/includes/weaponSettingsSpacecruiser.oxi	8721-8880
/code/branches/bigships/data/levels/includes/weaponSettingsSpacecruiser.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/weaponSettingsSpacecruiser.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/weaponSettingsSpacecruiser.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/weaponSettingsSpacecruiser.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/weaponSettingsSpacecruiser.oxi	1802-1808
/code/branches/chat/data/levels/includes/weaponSettingsSpacecruiser.oxi	6527-6797
/code/branches/chat2/data/levels/includes/weaponSettingsSpacecruiser.oxi	6836-6910
/code/branches/console/data/levels/includes/weaponSettingsSpacecruiser.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/weaponSettingsSpacecruiser.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/weaponSettingsSpacecruiser.oxi	7178-7283
/code/branches/core3/data/levels/includes/weaponSettingsSpacecruiser.oxi	1572-1739
/code/branches/core4/data/levels/includes/weaponSettingsSpacecruiser.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/weaponSettingsSpacecruiser.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/weaponSettingsSpacecruiser.oxi	7537-7686
/code/branches/doc/data/levels/includes/weaponSettingsSpacecruiser.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/weaponSettingsSpacecruiser.oxi	8101-8192
/code/branches/dockingsystem2/data/levels/includes/weaponSettingsSpacecruiser.oxi	8196-8560
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsSpacecruiser.oxi	6584-7030
/code/branches/environment3/data/levels/includes/weaponSettingsSpacecruiser.oxi	8887-8975
/code/branches/formation/data/levels/includes/weaponSettingsSpacecruiser.oxi	8885-8991
/code/branches/fps/data/levels/includes/weaponSettingsSpacecruiser.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/weaponSettingsSpacecruiser.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/weaponSettingsSpacecruiser.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/weaponSettingsSpacecruiser.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/weaponSettingsSpacecruiser.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/weaponSettingsSpacecruiser.oxi	1580
/code/branches/gui/data/levels/includes/weaponSettingsSpacecruiser.oxi	1635-1723,2795-2894
/code/branches/hud/data/levels/includes/weaponSettingsSpacecruiser.oxi	8883-8986
/code/branches/hudelements/data/levels/includes/weaponSettingsSpacecruiser.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/weaponSettingsSpacecruiser.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/weaponSettingsSpacecruiser.oxi	6000-6023
/code/branches/input/data/levels/includes/weaponSettingsSpacecruiser.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/weaponSettingsSpacecruiser.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/weaponSettingsSpacecruiser.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/weaponSettingsSpacecruiser.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/weaponSettingsSpacecruiser.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/weaponSettingsSpacecruiser.oxi	7903-8175
/code/branches/libraries/data/levels/includes/weaponSettingsSpacecruiser.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/weaponSettingsSpacecruiser.oxi	5703-5737
/code/branches/lod/data/levels/includes/weaponSettingsSpacecruiser.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/weaponSettingsSpacecruiser.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/weaponSettingsSpacecruiser.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/weaponSettingsSpacecruiser.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/weaponSettingsSpacecruiser.oxi	7502-7738
/code/branches/menu/data/levels/includes/weaponSettingsSpacecruiser.oxi	5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/weaponSettingsSpacecruiser.oxi	8884-8976
/code/branches/miniprojects/data/levels/includes/weaponSettingsSpacecruiser.oxi	2754-2824
/code/branches/netp2/data/levels/includes/weaponSettingsSpacecruiser.oxi	2835-2988
/code/branches/netp3/data/levels/includes/weaponSettingsSpacecruiser.oxi	2988-3082
/code/branches/netp6/data/levels/includes/weaponSettingsSpacecruiser.oxi	3214-3302
/code/branches/network/data/levels/includes/weaponSettingsSpacecruiser.oxi	2356
/code/branches/network2/data/levels/includes/weaponSettingsSpacecruiser.oxi	6434-6465
/code/branches/network3/data/levels/includes/weaponSettingsSpacecruiser.oxi	7196-7344
/code/branches/network4/data/levels/includes/weaponSettingsSpacecruiser.oxi	7497-7755
/code/branches/network5/data/levels/includes/weaponSettingsSpacecruiser.oxi	7757-7781
/code/branches/network6/data/levels/includes/weaponSettingsSpacecruiser.oxi	7823-8315
/code/branches/network64/data/levels/includes/weaponSettingsSpacecruiser.oxi	2210-2355
/code/branches/notifications/data/levels/includes/weaponSettingsSpacecruiser.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/weaponSettingsSpacecruiser.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/weaponSettingsSpacecruiser.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/weaponSettingsSpacecruiser.oxi	7506-7788
/code/branches/output/data/levels/includes/weaponSettingsSpacecruiser.oxi	8739-8857
/code/branches/overlay/data/levels/includes/weaponSettingsSpacecruiser.oxi	2117-2385
/code/branches/particles/data/levels/includes/weaponSettingsSpacecruiser.oxi	2829-3085
/code/branches/particles2/data/levels/includes/weaponSettingsSpacecruiser.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/weaponSettingsSpacecruiser.oxi	3113-3194
/code/branches/physics/data/levels/includes/weaponSettingsSpacecruiser.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/weaponSettingsSpacecruiser.oxi	2436-2457
/code/branches/pickup/data/levels/includes/weaponSettingsSpacecruiser.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/weaponSettingsSpacecruiser.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/weaponSettingsSpacecruiser.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/weaponSettingsSpacecruiser.oxi	6594-6710
/code/branches/pickups/data/levels/includes/weaponSettingsSpacecruiser.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/weaponSettingsSpacecruiser.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/weaponSettingsSpacecruiser.oxi	7262-7263
/code/branches/portals/data/levels/includes/weaponSettingsSpacecruiser.oxi	8087-8455
/code/branches/portals2/data/levels/includes/weaponSettingsSpacecruiser.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/weaponSettingsSpacecruiser.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/weaponSettingsSpacecruiser.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/weaponSettingsSpacecruiser.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/weaponSettingsSpacecruiser.oxi	7003-7089
/code/branches/presentation/data/levels/includes/weaponSettingsSpacecruiser.oxi	2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/weaponSettingsSpacecruiser.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/weaponSettingsSpacecruiser.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/weaponSettingsSpacecruiser.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/weaponSettingsSpacecruiser.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/weaponSettingsSpacecruiser.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/weaponSettingsSpacecruiser.oxi	7614-7647
/code/branches/resource/data/levels/includes/weaponSettingsSpacecruiser.oxi	3327-3366
/code/branches/resource2/data/levels/includes/weaponSettingsSpacecruiser.oxi	3372-5694
/code/branches/rocket/data/levels/includes/weaponSettingsSpacecruiser.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/weaponSettingsSpacecruiser.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/weaponSettingsSpacecruiser.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/weaponSettingsSpacecruiser.oxi	6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsSpacecruiser.oxi	2829-3010
/code/branches/sound3/data/levels/includes/weaponSettingsSpacecruiser.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/weaponSettingsSpacecruiser.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/weaponSettingsSpacecruiser.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/weaponSettingsSpacecruiser.oxi	8182-8630
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsSpacecruiser.oxi	8881-8996
/code/branches/steering/data/levels/includes/weaponSettingsSpacecruiser.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/weaponSettingsSpacecruiser.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/weaponSettingsSpacecruiser.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/weaponSettingsSpacecruiser.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/weaponSettingsSpacecruiser.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/weaponSettingsSpacecruiser.oxi	8440-8716
/code/branches/usability/data/levels/includes/weaponSettingsSpacecruiser.oxi	7915-8078
/code/branches/weapon/data/levels/includes/weaponSettingsSpacecruiser.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/weaponSettingsSpacecruiser.oxi	2107-2488
/code/branches/weapons/data/levels/includes/weaponSettingsSpacecruiser.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/weaponSettingsSpacecruiser.oxi	2742-2890

code/branches/presentation2012/data/levels/includes/weaponSettingsSwallow.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/environment3/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/formation/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/gamecontent/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/hud/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/menue/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/output/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/presentation/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/usability/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/trunk/data/levels/includes/weaponSettingsSwallow.oxi	merged	eligible
/code/branches/ai/data/levels/includes/weaponSettingsSwallow.oxi	6592-7033
/code/branches/ai2/data/levels/includes/weaponSettingsSwallow.oxi	8721-8880
/code/branches/bigships/data/levels/includes/weaponSettingsSwallow.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/weaponSettingsSwallow.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/weaponSettingsSwallow.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/weaponSettingsSwallow.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/weaponSettingsSwallow.oxi	1802-1808
/code/branches/chat/data/levels/includes/weaponSettingsSwallow.oxi	6527-6797
/code/branches/chat2/data/levels/includes/weaponSettingsSwallow.oxi	6836-6910
/code/branches/console/data/levels/includes/weaponSettingsSwallow.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/weaponSettingsSwallow.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/weaponSettingsSwallow.oxi	7178-7283
/code/branches/core3/data/levels/includes/weaponSettingsSwallow.oxi	1572-1739
/code/branches/core4/data/levels/includes/weaponSettingsSwallow.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/weaponSettingsSwallow.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/weaponSettingsSwallow.oxi	7537-7686
/code/branches/doc/data/levels/includes/weaponSettingsSwallow.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/weaponSettingsSwallow.oxi	8101-8192
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsSwallow.oxi	6584-7030
/code/branches/fps/data/levels/includes/weaponSettingsSwallow.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/weaponSettingsSwallow.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/weaponSettingsSwallow.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/weaponSettingsSwallow.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/weaponSettingsSwallow.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/weaponSettingsSwallow.oxi	1580
/code/branches/gui/data/levels/includes/weaponSettingsSwallow.oxi	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/weaponSettingsSwallow.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/weaponSettingsSwallow.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/weaponSettingsSwallow.oxi	6000-6023
/code/branches/input/data/levels/includes/weaponSettingsSwallow.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/weaponSettingsSwallow.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/weaponSettingsSwallow.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/weaponSettingsSwallow.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/weaponSettingsSwallow.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/weaponSettingsSwallow.oxi	7903-8175
/code/branches/libraries/data/levels/includes/weaponSettingsSwallow.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/weaponSettingsSwallow.oxi	5703-5737
/code/branches/lod/data/levels/includes/weaponSettingsSwallow.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/weaponSettingsSwallow.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/weaponSettingsSwallow.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/weaponSettingsSwallow.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/weaponSettingsSwallow.oxi	7502-7738
/code/branches/menu/data/levels/includes/weaponSettingsSwallow.oxi	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/weaponSettingsSwallow.oxi	2754-2824
/code/branches/netp2/data/levels/includes/weaponSettingsSwallow.oxi	2835-2988
/code/branches/netp3/data/levels/includes/weaponSettingsSwallow.oxi	2988-3082
/code/branches/netp6/data/levels/includes/weaponSettingsSwallow.oxi	3214-3302
/code/branches/network/data/levels/includes/weaponSettingsSwallow.oxi	2356
/code/branches/network2/data/levels/includes/weaponSettingsSwallow.oxi	6434-6465
/code/branches/network3/data/levels/includes/weaponSettingsSwallow.oxi	7196-7344
/code/branches/network4/data/levels/includes/weaponSettingsSwallow.oxi	7497-7755
/code/branches/network5/data/levels/includes/weaponSettingsSwallow.oxi	7757-7781
/code/branches/network6/data/levels/includes/weaponSettingsSwallow.oxi	7823-8315
/code/branches/network64/data/levels/includes/weaponSettingsSwallow.oxi	2210-2355
/code/branches/notifications/data/levels/includes/weaponSettingsSwallow.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/weaponSettingsSwallow.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/weaponSettingsSwallow.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/weaponSettingsSwallow.oxi	7506-7788
/code/branches/overlay/data/levels/includes/weaponSettingsSwallow.oxi	2117-2385
/code/branches/particles/data/levels/includes/weaponSettingsSwallow.oxi	2829-3085
/code/branches/particles2/data/levels/includes/weaponSettingsSwallow.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/weaponSettingsSwallow.oxi	3113-3194
/code/branches/physics/data/levels/includes/weaponSettingsSwallow.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/weaponSettingsSwallow.oxi	2436-2457
/code/branches/pickup/data/levels/includes/weaponSettingsSwallow.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/weaponSettingsSwallow.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/weaponSettingsSwallow.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/weaponSettingsSwallow.oxi	6594-6710
/code/branches/pickups/data/levels/includes/weaponSettingsSwallow.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/weaponSettingsSwallow.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/weaponSettingsSwallow.oxi	7262-7263
/code/branches/portals/data/levels/includes/weaponSettingsSwallow.oxi	8087-8455
/code/branches/portals2/data/levels/includes/weaponSettingsSwallow.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/weaponSettingsSwallow.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/weaponSettingsSwallow.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/weaponSettingsSwallow.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/weaponSettingsSwallow.oxi	7003-7089
/code/branches/presentation2/data/levels/includes/weaponSettingsSwallow.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/weaponSettingsSwallow.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/weaponSettingsSwallow.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/weaponSettingsSwallow.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/weaponSettingsSwallow.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/weaponSettingsSwallow.oxi	7614-7647
/code/branches/resource/data/levels/includes/weaponSettingsSwallow.oxi	3327-3366
/code/branches/resource2/data/levels/includes/weaponSettingsSwallow.oxi	3372-5694
/code/branches/rocket/data/levels/includes/weaponSettingsSwallow.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/weaponSettingsSwallow.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/weaponSettingsSwallow.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/weaponSettingsSwallow.oxi	6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsSwallow.oxi	2829-3010
/code/branches/sound3/data/levels/includes/weaponSettingsSwallow.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/weaponSettingsSwallow.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/weaponSettingsSwallow.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/weaponSettingsSwallow.oxi	8182-8630
/code/branches/steering/data/levels/includes/weaponSettingsSwallow.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/weaponSettingsSwallow.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/weaponSettingsSwallow.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/weaponSettingsSwallow.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/weaponSettingsSwallow.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/weaponSettingsSwallow.oxi	8440-8716
/code/branches/weapon/data/levels/includes/weaponSettingsSwallow.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/weaponSettingsSwallow.oxi	2107-2488
/code/branches/weapons/data/levels/includes/weaponSettingsSwallow.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/weaponSettingsSwallow.oxi	2742-2890

code/branches/presentation2012/data/levels/includes/weaponSettingsTransporter.oxi

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/environment3/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/formation/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/gamecontent/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/hud/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/masterserverfix/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/menue/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/newlevel2012/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/output/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/pickup2012/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/presentation/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/presentation2011/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/shipSelection/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/sound2012/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/spacegate/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/surfaceRace/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/usability/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/trunk/data/levels/includes/weaponSettingsTransporter.oxi	merged	eligible
/code/branches/ai/data/levels/includes/weaponSettingsTransporter.oxi	6592-7033
/code/branches/ai2/data/levels/includes/weaponSettingsTransporter.oxi	8721-8880
/code/branches/bigships/data/levels/includes/weaponSettingsTransporter.oxi	8137-8588
/code/branches/buildsystem/data/levels/includes/weaponSettingsTransporter.oxi	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/includes/weaponSettingsTransporter.oxi	2506-2658
/code/branches/buildsystem3/data/levels/includes/weaponSettingsTransporter.oxi	2662-2708
/code/branches/ceguilua/data/levels/includes/weaponSettingsTransporter.oxi	1802-1808
/code/branches/chat/data/levels/includes/weaponSettingsTransporter.oxi	6527-6797
/code/branches/chat2/data/levels/includes/weaponSettingsTransporter.oxi	6836-6910
/code/branches/console/data/levels/includes/weaponSettingsTransporter.oxi	5941-6104
/code/branches/consolecommands2/data/levels/includes/weaponSettingsTransporter.oxi	6451-7178
/code/branches/consolecommands3/data/levels/includes/weaponSettingsTransporter.oxi	7178-7283
/code/branches/core3/data/levels/includes/weaponSettingsTransporter.oxi	1572-1739
/code/branches/core4/data/levels/includes/weaponSettingsTransporter.oxi	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/includes/weaponSettingsTransporter.oxi	5768-5928,6009
/code/branches/data_cleanup/data/levels/includes/weaponSettingsTransporter.oxi	7537-7686
/code/branches/doc/data/levels/includes/weaponSettingsTransporter.oxi	7290-7400
/code/branches/dockingsystem/data/levels/includes/weaponSettingsTransporter.oxi	8101-8192
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsTransporter.oxi	6584-7030
/code/branches/fps/data/levels/includes/weaponSettingsTransporter.oxi	6591-7072
/code/branches/gameimmersion/data/levels/includes/weaponSettingsTransporter.oxi	8102-8577
/code/branches/gamestate/data/levels/includes/weaponSettingsTransporter.oxi	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/includes/weaponSettingsTransporter.oxi	6594-6745
/code/branches/gametypes/data/levels/includes/weaponSettingsTransporter.oxi	2826-3031
/code/branches/gcc43/data/levels/includes/weaponSettingsTransporter.oxi	1580
/code/branches/gui/data/levels/includes/weaponSettingsTransporter.oxi	1635-1723,2795-2894
/code/branches/hudelements/data/levels/includes/weaponSettingsTransporter.oxi	6584-6941
/code/branches/hudimprovements/data/levels/includes/weaponSettingsTransporter.oxi	7920-8672
/code/branches/ingamemenu/data/levels/includes/weaponSettingsTransporter.oxi	6000-6023
/code/branches/input/data/levels/includes/weaponSettingsTransporter.oxi	1629-1636
/code/branches/ipv6/data/levels/includes/weaponSettingsTransporter.oxi	7293-7458
/code/branches/kicklib/data/levels/includes/weaponSettingsTransporter.oxi	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/includes/weaponSettingsTransporter.oxi	8282-8350
/code/branches/lastmanstanding/data/levels/includes/weaponSettingsTransporter.oxi	7479-7644
/code/branches/lastmanstanding3/data/levels/includes/weaponSettingsTransporter.oxi	7903-8175
/code/branches/libraries/data/levels/includes/weaponSettingsTransporter.oxi	5612-5692
/code/branches/libraries2/data/levels/includes/weaponSettingsTransporter.oxi	5703-5737
/code/branches/lod/data/levels/includes/weaponSettingsTransporter.oxi	6586-6911
/code/branches/lodfinal/data/levels/includes/weaponSettingsTransporter.oxi	2372-2411
/code/branches/mac_osx/data/levels/includes/weaponSettingsTransporter.oxi	7789-8128,8135
/code/branches/map/data/levels/includes/weaponSettingsTransporter.oxi	2801-3086,3089
/code/branches/masterserver/data/levels/includes/weaponSettingsTransporter.oxi	7502-7738
/code/branches/menu/data/levels/includes/weaponSettingsTransporter.oxi	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/includes/weaponSettingsTransporter.oxi	2754-2824
/code/branches/netp2/data/levels/includes/weaponSettingsTransporter.oxi	2835-2988
/code/branches/netp3/data/levels/includes/weaponSettingsTransporter.oxi	2988-3082
/code/branches/netp6/data/levels/includes/weaponSettingsTransporter.oxi	3214-3302
/code/branches/network/data/levels/includes/weaponSettingsTransporter.oxi	2356
/code/branches/network2/data/levels/includes/weaponSettingsTransporter.oxi	6434-6465
/code/branches/network3/data/levels/includes/weaponSettingsTransporter.oxi	7196-7344
/code/branches/network4/data/levels/includes/weaponSettingsTransporter.oxi	7497-7755
/code/branches/network5/data/levels/includes/weaponSettingsTransporter.oxi	7757-7781
/code/branches/network6/data/levels/includes/weaponSettingsTransporter.oxi	7823-8315
/code/branches/network64/data/levels/includes/weaponSettingsTransporter.oxi	2210-2355
/code/branches/notifications/data/levels/includes/weaponSettingsTransporter.oxi	7314-7401
/code/branches/objecthierarchy/data/levels/includes/weaponSettingsTransporter.oxi	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/includes/weaponSettingsTransporter.oxi	2171-2479
/code/branches/ois_update/data/levels/includes/weaponSettingsTransporter.oxi	7506-7788
/code/branches/overlay/data/levels/includes/weaponSettingsTransporter.oxi	2117-2385
/code/branches/particles/data/levels/includes/weaponSettingsTransporter.oxi	2829-3085
/code/branches/particles2/data/levels/includes/weaponSettingsTransporter.oxi	6050-6106,6109
/code/branches/pch/data/levels/includes/weaponSettingsTransporter.oxi	3113-3194
/code/branches/physics/data/levels/includes/weaponSettingsTransporter.oxi	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/includes/weaponSettingsTransporter.oxi	2436-2457
/code/branches/pickup/data/levels/includes/weaponSettingsTransporter.oxi	8145-8555
/code/branches/pickup2/data/levels/includes/weaponSettingsTransporter.oxi	5942-6405
/code/branches/pickup3/data/levels/includes/weaponSettingsTransporter.oxi	6418-6523
/code/branches/pickup4/data/levels/includes/weaponSettingsTransporter.oxi	6594-6710
/code/branches/pickups/data/levels/includes/weaponSettingsTransporter.oxi	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/includes/weaponSettingsTransporter.oxi	2107-2497,2915-3071
/code/branches/png2/data/levels/includes/weaponSettingsTransporter.oxi	7262-7263
/code/branches/portals/data/levels/includes/weaponSettingsTransporter.oxi	8087-8455
/code/branches/portals2/data/levels/includes/weaponSettingsTransporter.oxi	8460-8602
/code/branches/ppspickups1/data/levels/includes/weaponSettingsTransporter.oxi	6552-6708
/code/branches/ppspickups2/data/levels/includes/weaponSettingsTransporter.oxi	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/includes/weaponSettingsTransporter.oxi	6757-6997
/code/branches/ppspickups4/data/levels/includes/weaponSettingsTransporter.oxi	7003-7089
/code/branches/presentation2/data/levels/includes/weaponSettingsTransporter.oxi	6106-6416,7787-7800
/code/branches/presentation3/data/levels/includes/weaponSettingsTransporter.oxi	6913-7162
/code/branches/questsystem/data/levels/includes/weaponSettingsTransporter.oxi	1894-2088
/code/branches/questsystem2/data/levels/includes/weaponSettingsTransporter.oxi	2107-2259
/code/branches/questsystem5/data/levels/includes/weaponSettingsTransporter.oxi	2776-2905
/code/branches/releasetodo/data/levels/includes/weaponSettingsTransporter.oxi	7614-7647
/code/branches/resource/data/levels/includes/weaponSettingsTransporter.oxi	3327-3366
/code/branches/resource2/data/levels/includes/weaponSettingsTransporter.oxi	3372-5694
/code/branches/rocket/data/levels/includes/weaponSettingsTransporter.oxi	6523-6950
/code/branches/rocket2/data/levels/includes/weaponSettingsTransporter.oxi	6953-6970
/code/branches/script_trigger/data/levels/includes/weaponSettingsTransporter.oxi	1295-1953,1955
/code/branches/skybox2/data/levels/includes/weaponSettingsTransporter.oxi	6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsTransporter.oxi	2829-3010
/code/branches/sound3/data/levels/includes/weaponSettingsTransporter.oxi	5941-6102
/code/branches/spaceboundaries/data/levels/includes/weaponSettingsTransporter.oxi	8085-8457
/code/branches/spaceboundaries2/data/levels/includes/weaponSettingsTransporter.oxi	8460-8613
/code/branches/spacerace/data/levels/includes/weaponSettingsTransporter.oxi	8182-8630
/code/branches/steering/data/levels/includes/weaponSettingsTransporter.oxi	5949-6091,8140-8595
/code/branches/tetris/data/levels/includes/weaponSettingsTransporter.oxi	8100-8563
/code/branches/tutoriallevel/data/levels/includes/weaponSettingsTransporter.oxi	7827-8370
/code/branches/tutoriallevel2/data/levels/includes/weaponSettingsTransporter.oxi	8370-8452
/code/branches/tutoriallevel3/data/levels/includes/weaponSettingsTransporter.oxi	8453-8636
/code/branches/unity_build/data/levels/includes/weaponSettingsTransporter.oxi	8440-8716
/code/branches/weapon/data/levels/includes/weaponSettingsTransporter.oxi	1925-2094
/code/branches/weapon2/data/levels/includes/weaponSettingsTransporter.oxi	2107-2488
/code/branches/weapons/data/levels/includes/weaponSettingsTransporter.oxi	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/includes/weaponSettingsTransporter.oxi	2742-2890

code/branches/presentation2012/data/levels/lastManStanding.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/environment3/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/formation/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/gamecontent/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/hud/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/menue/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/output/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/pickup2012/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/presentation/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/presentation2011/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/shipSelection/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/sound2012/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/spacegate/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/usability/data/levels/lastManStanding.oxw	merged	eligible
/code/trunk/data/levels/lastManStanding.oxw	merged	eligible
/code/branches/ai/data/levels/lastManStanding.oxw	6592-7033
/code/branches/ai2/data/levels/lastManStanding.oxw	8721-8880
/code/branches/bigships/data/levels/lastManStanding.oxw	8137-8588
/code/branches/buildsystem/data/levels/lastManStanding.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/lastManStanding.oxw	2506-2658
/code/branches/buildsystem3/data/levels/lastManStanding.oxw	2662-2708
/code/branches/ceguilua/data/levels/lastManStanding.oxw	1802-1808
/code/branches/chat/data/levels/lastManStanding.oxw	6527-6797
/code/branches/chat2/data/levels/lastManStanding.oxw	6836-6910
/code/branches/console/data/levels/lastManStanding.oxw	5941-6104
/code/branches/consolecommands2/data/levels/lastManStanding.oxw	6451-7178
/code/branches/consolecommands3/data/levels/lastManStanding.oxw	7178-7283
/code/branches/core3/data/levels/lastManStanding.oxw	1572-1739
/code/branches/core4/data/levels/lastManStanding.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/lastManStanding.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/lastManStanding.oxw	7537-7686
/code/branches/doc/data/levels/lastManStanding.oxw	7290-7400
/code/branches/dockingsystem/data/levels/lastManStanding.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/lastManStanding.oxw	6584-7030
/code/branches/fps/data/levels/lastManStanding.oxw	6591-7072
/code/branches/gameimmersion/data/levels/lastManStanding.oxw	8102-8577
/code/branches/gamestate/data/levels/lastManStanding.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/lastManStanding.oxw	6594-6745
/code/branches/gametypes/data/levels/lastManStanding.oxw	2826-3031
/code/branches/gcc43/data/levels/lastManStanding.oxw	1580
/code/branches/gui/data/levels/lastManStanding.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/lastManStanding.oxw	6584-6941
/code/branches/hudimprovements/data/levels/lastManStanding.oxw	7920-8672
/code/branches/ingamemenu/data/levels/lastManStanding.oxw	6000-6023
/code/branches/input/data/levels/lastManStanding.oxw	1629-1636
/code/branches/ipv6/data/levels/lastManStanding.oxw	7293-7458
/code/branches/kicklib/data/levels/lastManStanding.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/lastManStanding.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/lastManStanding.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/lastManStanding.oxw	7903-8175
/code/branches/libraries/data/levels/lastManStanding.oxw	5612-5692
/code/branches/libraries2/data/levels/lastManStanding.oxw	5703-5737
/code/branches/lod/data/levels/lastManStanding.oxw	6586-6911
/code/branches/lodfinal/data/levels/lastManStanding.oxw	2372-2411
/code/branches/mac_osx/data/levels/lastManStanding.oxw	7789-8128,8135
/code/branches/map/data/levels/lastManStanding.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/lastManStanding.oxw	7502-7738
/code/branches/menu/data/levels/lastManStanding.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/lastManStanding.oxw	2754-2824
/code/branches/netp2/data/levels/lastManStanding.oxw	2835-2988
/code/branches/netp3/data/levels/lastManStanding.oxw	2988-3082
/code/branches/netp6/data/levels/lastManStanding.oxw	3214-3302
/code/branches/network/data/levels/lastManStanding.oxw	2356
/code/branches/network2/data/levels/lastManStanding.oxw	6434-6465
/code/branches/network3/data/levels/lastManStanding.oxw	7196-7344
/code/branches/network4/data/levels/lastManStanding.oxw	7497-7755
/code/branches/network5/data/levels/lastManStanding.oxw	7757-7781
/code/branches/network6/data/levels/lastManStanding.oxw	7823-8315
/code/branches/network64/data/levels/lastManStanding.oxw	2210-2355
/code/branches/notifications/data/levels/lastManStanding.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/lastManStanding.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/lastManStanding.oxw	2171-2479
/code/branches/ois_update/data/levels/lastManStanding.oxw	7506-7788
/code/branches/overlay/data/levels/lastManStanding.oxw	2117-2385
/code/branches/particles/data/levels/lastManStanding.oxw	2829-3085
/code/branches/particles2/data/levels/lastManStanding.oxw	6050-6106,6109
/code/branches/pch/data/levels/lastManStanding.oxw	3113-3194
/code/branches/physics/data/levels/lastManStanding.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/lastManStanding.oxw	2436-2457
/code/branches/pickup/data/levels/lastManStanding.oxw	8145-8555
/code/branches/pickup2/data/levels/lastManStanding.oxw	5942-6405
/code/branches/pickup3/data/levels/lastManStanding.oxw	6418-6523
/code/branches/pickup4/data/levels/lastManStanding.oxw	6594-6710
/code/branches/pickups/data/levels/lastManStanding.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/lastManStanding.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/lastManStanding.oxw	7262-7263
/code/branches/portals/data/levels/lastManStanding.oxw	8087-8455
/code/branches/portals2/data/levels/lastManStanding.oxw	8460-8602
/code/branches/ppspickups1/data/levels/lastManStanding.oxw	6552-6708
/code/branches/ppspickups2/data/levels/lastManStanding.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/lastManStanding.oxw	6757-6997
/code/branches/ppspickups4/data/levels/lastManStanding.oxw	7003-7089
/code/branches/presentation2/data/levels/lastManStanding.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/lastManStanding.oxw	6913-7162
/code/branches/questsystem/data/levels/lastManStanding.oxw	1894-2088
/code/branches/questsystem2/data/levels/lastManStanding.oxw	2107-2259
/code/branches/questsystem5/data/levels/lastManStanding.oxw	2776-2905
/code/branches/releasetodo/data/levels/lastManStanding.oxw	7614-7647
/code/branches/resource/data/levels/lastManStanding.oxw	3327-3366
/code/branches/resource2/data/levels/lastManStanding.oxw	3372-5694
/code/branches/rocket/data/levels/lastManStanding.oxw	6523-6950
/code/branches/rocket2/data/levels/lastManStanding.oxw	6953-6970
/code/branches/script_trigger/data/levels/lastManStanding.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/lastManStanding.oxw	6559-6989
/code/branches/sound/data/levels/lastManStanding.oxw	2829-3010
/code/branches/sound3/data/levels/lastManStanding.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/lastManStanding.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/lastManStanding.oxw	8460-8613
/code/branches/spacerace/data/levels/lastManStanding.oxw	8182-8630
/code/branches/steering/data/levels/lastManStanding.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/lastManStanding.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/lastManStanding.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/lastManStanding.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/lastManStanding.oxw	8453-8636
/code/branches/unity_build/data/levels/lastManStanding.oxw	8440-8716
/code/branches/weapon/data/levels/lastManStanding.oxw	1925-2094
/code/branches/weapon2/data/levels/lastManStanding.oxw	2107-2488
/code/branches/weapons/data/levels/lastManStanding.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/lastManStanding.oxw	2742-2890

code/branches/presentation2012/data/levels/lastTeamStanding.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/environment3/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/formation/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/gamecontent/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/hud/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/menue/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/output/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/pickup2012/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/presentation/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/presentation2011/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/shipSelection/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/sound2012/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/spacegate/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/lastTeamStanding.oxw	merged	eligible
/code/trunk/data/levels/lastTeamStanding.oxw	merged	eligible
/code/branches/ai/data/levels/lastTeamStanding.oxw	6592-7033
/code/branches/ai2/data/levels/lastTeamStanding.oxw	8721-8880
/code/branches/bigships/data/levels/lastTeamStanding.oxw	8137-8588
/code/branches/buildsystem/data/levels/lastTeamStanding.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/lastTeamStanding.oxw	2506-2658
/code/branches/buildsystem3/data/levels/lastTeamStanding.oxw	2662-2708
/code/branches/ceguilua/data/levels/lastTeamStanding.oxw	1802-1808
/code/branches/chat/data/levels/lastTeamStanding.oxw	6527-6797
/code/branches/chat2/data/levels/lastTeamStanding.oxw	6836-6910
/code/branches/console/data/levels/lastTeamStanding.oxw	5941-6104
/code/branches/consolecommands2/data/levels/lastTeamStanding.oxw	6451-7178
/code/branches/consolecommands3/data/levels/lastTeamStanding.oxw	7178-7283
/code/branches/core3/data/levels/lastTeamStanding.oxw	1572-1739
/code/branches/core4/data/levels/lastTeamStanding.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/lastTeamStanding.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/lastTeamStanding.oxw	7537-7686
/code/branches/doc/data/levels/lastTeamStanding.oxw	7290-7400
/code/branches/dockingsystem/data/levels/lastTeamStanding.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/lastTeamStanding.oxw	6584-7030
/code/branches/fps/data/levels/lastTeamStanding.oxw	6591-7072
/code/branches/gameimmersion/data/levels/lastTeamStanding.oxw	8102-8577
/code/branches/gamestate/data/levels/lastTeamStanding.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/lastTeamStanding.oxw	6594-6745
/code/branches/gametypes/data/levels/lastTeamStanding.oxw	2826-3031
/code/branches/gcc43/data/levels/lastTeamStanding.oxw	1580
/code/branches/gui/data/levels/lastTeamStanding.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/lastTeamStanding.oxw	6584-6941
/code/branches/hudimprovements/data/levels/lastTeamStanding.oxw	7920-8672
/code/branches/ingamemenu/data/levels/lastTeamStanding.oxw	6000-6023
/code/branches/input/data/levels/lastTeamStanding.oxw	1629-1636
/code/branches/ipv6/data/levels/lastTeamStanding.oxw	7293-7458
/code/branches/kicklib/data/levels/lastTeamStanding.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/lastTeamStanding.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/lastTeamStanding.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/lastTeamStanding.oxw	7903-8175
/code/branches/libraries/data/levels/lastTeamStanding.oxw	5612-5692
/code/branches/libraries2/data/levels/lastTeamStanding.oxw	5703-5737
/code/branches/lod/data/levels/lastTeamStanding.oxw	6586-6911
/code/branches/lodfinal/data/levels/lastTeamStanding.oxw	2372-2411
/code/branches/mac_osx/data/levels/lastTeamStanding.oxw	7789-8128,8135
/code/branches/map/data/levels/lastTeamStanding.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/lastTeamStanding.oxw	7502-7738
/code/branches/menu/data/levels/lastTeamStanding.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/lastTeamStanding.oxw	2754-2824
/code/branches/netp2/data/levels/lastTeamStanding.oxw	2835-2988
/code/branches/netp3/data/levels/lastTeamStanding.oxw	2988-3082
/code/branches/netp6/data/levels/lastTeamStanding.oxw	3214-3302
/code/branches/network/data/levels/lastTeamStanding.oxw	2356
/code/branches/network2/data/levels/lastTeamStanding.oxw	6434-6465
/code/branches/network3/data/levels/lastTeamStanding.oxw	7196-7344
/code/branches/network4/data/levels/lastTeamStanding.oxw	7497-7755
/code/branches/network5/data/levels/lastTeamStanding.oxw	7757-7781
/code/branches/network6/data/levels/lastTeamStanding.oxw	7823-8315
/code/branches/network64/data/levels/lastTeamStanding.oxw	2210-2355
/code/branches/notifications/data/levels/lastTeamStanding.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/lastTeamStanding.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/lastTeamStanding.oxw	2171-2479
/code/branches/ois_update/data/levels/lastTeamStanding.oxw	7506-7788
/code/branches/overlay/data/levels/lastTeamStanding.oxw	2117-2385
/code/branches/particles/data/levels/lastTeamStanding.oxw	2829-3085
/code/branches/particles2/data/levels/lastTeamStanding.oxw	6050-6106,6109
/code/branches/pch/data/levels/lastTeamStanding.oxw	3113-3194
/code/branches/physics/data/levels/lastTeamStanding.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/lastTeamStanding.oxw	2436-2457
/code/branches/pickup/data/levels/lastTeamStanding.oxw	8145-8555
/code/branches/pickup2/data/levels/lastTeamStanding.oxw	5942-6405
/code/branches/pickup3/data/levels/lastTeamStanding.oxw	6418-6523
/code/branches/pickup4/data/levels/lastTeamStanding.oxw	6594-6710
/code/branches/pickups/data/levels/lastTeamStanding.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/lastTeamStanding.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/lastTeamStanding.oxw	7262-7263
/code/branches/portals/data/levels/lastTeamStanding.oxw	8087-8455
/code/branches/portals2/data/levels/lastTeamStanding.oxw	8460-8602
/code/branches/ppspickups1/data/levels/lastTeamStanding.oxw	6552-6708
/code/branches/ppspickups2/data/levels/lastTeamStanding.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/lastTeamStanding.oxw	6757-6997
/code/branches/ppspickups4/data/levels/lastTeamStanding.oxw	7003-7089
/code/branches/presentation2/data/levels/lastTeamStanding.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/lastTeamStanding.oxw	6913-7162
/code/branches/questsystem/data/levels/lastTeamStanding.oxw	1894-2088
/code/branches/questsystem2/data/levels/lastTeamStanding.oxw	2107-2259
/code/branches/questsystem5/data/levels/lastTeamStanding.oxw	2776-2905
/code/branches/releasetodo/data/levels/lastTeamStanding.oxw	7614-7647
/code/branches/resource/data/levels/lastTeamStanding.oxw	3327-3366
/code/branches/resource2/data/levels/lastTeamStanding.oxw	3372-5694
/code/branches/rocket/data/levels/lastTeamStanding.oxw	6523-6950
/code/branches/rocket2/data/levels/lastTeamStanding.oxw	6953-6970
/code/branches/script_trigger/data/levels/lastTeamStanding.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/lastTeamStanding.oxw	6559-6989
/code/branches/sound/data/levels/lastTeamStanding.oxw	2829-3010
/code/branches/sound3/data/levels/lastTeamStanding.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/lastTeamStanding.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/lastTeamStanding.oxw	8460-8613
/code/branches/spacerace/data/levels/lastTeamStanding.oxw	8182-8630
/code/branches/steering/data/levels/lastTeamStanding.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/lastTeamStanding.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/lastTeamStanding.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/lastTeamStanding.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/lastTeamStanding.oxw	8453-8636
/code/branches/unity_build/data/levels/lastTeamStanding.oxw	8440-8716
/code/branches/usability/data/levels/lastTeamStanding.oxw	7915-8078
/code/branches/weapon/data/levels/lastTeamStanding.oxw	1925-2094
/code/branches/weapon2/data/levels/lastTeamStanding.oxw	2107-2488
/code/branches/weapons/data/levels/lastTeamStanding.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/lastTeamStanding.oxw	2742-2890

code/branches/presentation2012/data/levels/lastTeamStandingII.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/environment3/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/formation/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/gamecontent/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/hud/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/menue/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/output/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/pickup2012/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/presentation/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/presentation2011/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/shipSelection/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/sound2012/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/spacegate/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/trunk/data/levels/lastTeamStandingII.oxw	merged	eligible
/code/branches/ai/data/levels/lastTeamStandingII.oxw	6592-7033
/code/branches/ai2/data/levels/lastTeamStandingII.oxw	8721-8880
/code/branches/bigships/data/levels/lastTeamStandingII.oxw	8137-8588
/code/branches/buildsystem/data/levels/lastTeamStandingII.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/lastTeamStandingII.oxw	2506-2658
/code/branches/buildsystem3/data/levels/lastTeamStandingII.oxw	2662-2708
/code/branches/ceguilua/data/levels/lastTeamStandingII.oxw	1802-1808
/code/branches/chat/data/levels/lastTeamStandingII.oxw	6527-6797
/code/branches/chat2/data/levels/lastTeamStandingII.oxw	6836-6910
/code/branches/console/data/levels/lastTeamStandingII.oxw	5941-6104
/code/branches/consolecommands2/data/levels/lastTeamStandingII.oxw	6451-7178
/code/branches/consolecommands3/data/levels/lastTeamStandingII.oxw	7178-7283
/code/branches/core3/data/levels/lastTeamStandingII.oxw	1572-1739
/code/branches/core4/data/levels/lastTeamStandingII.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/lastTeamStandingII.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/lastTeamStandingII.oxw	7537-7686
/code/branches/doc/data/levels/lastTeamStandingII.oxw	7290-7400
/code/branches/dockingsystem/data/levels/lastTeamStandingII.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/lastTeamStandingII.oxw	6584-7030
/code/branches/fps/data/levels/lastTeamStandingII.oxw	6591-7072
/code/branches/gameimmersion/data/levels/lastTeamStandingII.oxw	8102-8577
/code/branches/gamestate/data/levels/lastTeamStandingII.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/lastTeamStandingII.oxw	6594-6745
/code/branches/gametypes/data/levels/lastTeamStandingII.oxw	2826-3031
/code/branches/gcc43/data/levels/lastTeamStandingII.oxw	1580
/code/branches/gui/data/levels/lastTeamStandingII.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/lastTeamStandingII.oxw	6584-6941
/code/branches/hudimprovements/data/levels/lastTeamStandingII.oxw	7920-8672
/code/branches/ingamemenu/data/levels/lastTeamStandingII.oxw	6000-6023
/code/branches/input/data/levels/lastTeamStandingII.oxw	1629-1636
/code/branches/ipv6/data/levels/lastTeamStandingII.oxw	7293-7458
/code/branches/kicklib/data/levels/lastTeamStandingII.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/lastTeamStandingII.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/lastTeamStandingII.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/lastTeamStandingII.oxw	7903-8175
/code/branches/libraries/data/levels/lastTeamStandingII.oxw	5612-5692
/code/branches/libraries2/data/levels/lastTeamStandingII.oxw	5703-5737
/code/branches/lod/data/levels/lastTeamStandingII.oxw	6586-6911
/code/branches/lodfinal/data/levels/lastTeamStandingII.oxw	2372-2411
/code/branches/mac_osx/data/levels/lastTeamStandingII.oxw	7789-8128,8135
/code/branches/map/data/levels/lastTeamStandingII.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/lastTeamStandingII.oxw	7502-7738
/code/branches/menu/data/levels/lastTeamStandingII.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/lastTeamStandingII.oxw	2754-2824
/code/branches/netp2/data/levels/lastTeamStandingII.oxw	2835-2988
/code/branches/netp3/data/levels/lastTeamStandingII.oxw	2988-3082
/code/branches/netp6/data/levels/lastTeamStandingII.oxw	3214-3302
/code/branches/network/data/levels/lastTeamStandingII.oxw	2356
/code/branches/network2/data/levels/lastTeamStandingII.oxw	6434-6465
/code/branches/network3/data/levels/lastTeamStandingII.oxw	7196-7344
/code/branches/network4/data/levels/lastTeamStandingII.oxw	7497-7755
/code/branches/network5/data/levels/lastTeamStandingII.oxw	7757-7781
/code/branches/network6/data/levels/lastTeamStandingII.oxw	7823-8315
/code/branches/network64/data/levels/lastTeamStandingII.oxw	2210-2355
/code/branches/notifications/data/levels/lastTeamStandingII.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/lastTeamStandingII.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/lastTeamStandingII.oxw	2171-2479
/code/branches/ois_update/data/levels/lastTeamStandingII.oxw	7506-7788
/code/branches/overlay/data/levels/lastTeamStandingII.oxw	2117-2385
/code/branches/particles/data/levels/lastTeamStandingII.oxw	2829-3085
/code/branches/particles2/data/levels/lastTeamStandingII.oxw	6050-6106,6109
/code/branches/pch/data/levels/lastTeamStandingII.oxw	3113-3194
/code/branches/physics/data/levels/lastTeamStandingII.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/lastTeamStandingII.oxw	2436-2457
/code/branches/pickup/data/levels/lastTeamStandingII.oxw	8145-8555
/code/branches/pickup2/data/levels/lastTeamStandingII.oxw	5942-6405
/code/branches/pickup3/data/levels/lastTeamStandingII.oxw	6418-6523
/code/branches/pickup4/data/levels/lastTeamStandingII.oxw	6594-6710
/code/branches/pickups/data/levels/lastTeamStandingII.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/lastTeamStandingII.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/lastTeamStandingII.oxw	7262-7263
/code/branches/portals/data/levels/lastTeamStandingII.oxw	8087-8455
/code/branches/portals2/data/levels/lastTeamStandingII.oxw	8460-8602
/code/branches/ppspickups1/data/levels/lastTeamStandingII.oxw	6552-6708
/code/branches/ppspickups2/data/levels/lastTeamStandingII.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/lastTeamStandingII.oxw	6757-6997
/code/branches/ppspickups4/data/levels/lastTeamStandingII.oxw	7003-7089
/code/branches/presentation2/data/levels/lastTeamStandingII.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/lastTeamStandingII.oxw	6913-7162
/code/branches/questsystem/data/levels/lastTeamStandingII.oxw	1894-2088
/code/branches/questsystem2/data/levels/lastTeamStandingII.oxw	2107-2259
/code/branches/questsystem5/data/levels/lastTeamStandingII.oxw	2776-2905
/code/branches/releasetodo/data/levels/lastTeamStandingII.oxw	7614-7647
/code/branches/resource/data/levels/lastTeamStandingII.oxw	3327-3366
/code/branches/resource2/data/levels/lastTeamStandingII.oxw	3372-5694
/code/branches/rocket/data/levels/lastTeamStandingII.oxw	6523-6950
/code/branches/rocket2/data/levels/lastTeamStandingII.oxw	6953-6970
/code/branches/script_trigger/data/levels/lastTeamStandingII.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/lastTeamStandingII.oxw	6559-6989
/code/branches/sound/data/levels/lastTeamStandingII.oxw	2829-3010
/code/branches/sound3/data/levels/lastTeamStandingII.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/lastTeamStandingII.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/lastTeamStandingII.oxw	8460-8613
/code/branches/spacerace/data/levels/lastTeamStandingII.oxw	8182-8630
/code/branches/steering/data/levels/lastTeamStandingII.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/lastTeamStandingII.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/lastTeamStandingII.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/lastTeamStandingII.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/lastTeamStandingII.oxw	8453-8636
/code/branches/unity_build/data/levels/lastTeamStandingII.oxw	8440-8716
/code/branches/usability/data/levels/lastTeamStandingII.oxw	7915-8078
/code/branches/weapon/data/levels/lastTeamStandingII.oxw	1925-2094
/code/branches/weapon2/data/levels/lastTeamStandingII.oxw	2107-2488
/code/branches/weapons/data/levels/lastTeamStandingII.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/lastTeamStandingII.oxw	2742-2890

code/branches/presentation2012/data/levels/missionOne.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/gamecontent/data/levels/missionOne.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/missionOne.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/missionOne.oxw	merged	eligible
/code/branches/pickup2012/data/levels/missionOne.oxw	merged	eligible
/code/branches/presentation2011/data/levels/missionOne.oxw	merged	eligible
/code/branches/shipSelection/data/levels/missionOne.oxw	merged	eligible
/code/branches/sound2012/data/levels/missionOne.oxw	merged	eligible
/code/branches/spacegate/data/levels/missionOne.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/missionOne.oxw	merged	eligible
/code/trunk/data/levels/missionOne.oxw	merged	eligible
/code/branches/ai/data/levels/missionOne.oxw	6592-7033
/code/branches/ai2/data/levels/missionOne.oxw	8721-8880
/code/branches/bigships/data/levels/missionOne.oxw	8137-8588
/code/branches/buildsystem/data/levels/missionOne.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/missionOne.oxw	2506-2658
/code/branches/buildsystem3/data/levels/missionOne.oxw	2662-2708
/code/branches/ceguilua/data/levels/missionOne.oxw	1802-1808
/code/branches/chat/data/levels/missionOne.oxw	6527-6797
/code/branches/chat2/data/levels/missionOne.oxw	6836-6910
/code/branches/console/data/levels/missionOne.oxw	5941-6104
/code/branches/consolecommands2/data/levels/missionOne.oxw	6451-7178
/code/branches/consolecommands3/data/levels/missionOne.oxw	7178-7283
/code/branches/core3/data/levels/missionOne.oxw	1572-1739
/code/branches/core4/data/levels/missionOne.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/missionOne.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/missionOne.oxw	7537-7686
/code/branches/doc/data/levels/missionOne.oxw	7290-7400
/code/branches/dockingsystem/data/levels/missionOne.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/missionOne.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/missionOne.oxw	6584-7030
/code/branches/environment3/data/levels/missionOne.oxw	8887-8975
/code/branches/formation/data/levels/missionOne.oxw	8885-8991
/code/branches/fps/data/levels/missionOne.oxw	6591-7072
/code/branches/gameimmersion/data/levels/missionOne.oxw	8102-8577
/code/branches/gamestate/data/levels/missionOne.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/missionOne.oxw	6594-6745
/code/branches/gametypes/data/levels/missionOne.oxw	2826-3031
/code/branches/gcc43/data/levels/missionOne.oxw	1580
/code/branches/gui/data/levels/missionOne.oxw	1635-1723,2795-2894
/code/branches/hud/data/levels/missionOne.oxw	8883-8986
/code/branches/hudelements/data/levels/missionOne.oxw	6584-6941
/code/branches/hudimprovements/data/levels/missionOne.oxw	7920-8672
/code/branches/ingamemenu/data/levels/missionOne.oxw	6000-6023
/code/branches/input/data/levels/missionOne.oxw	1629-1636
/code/branches/ipv6/data/levels/missionOne.oxw	7293-7458
/code/branches/kicklib/data/levels/missionOne.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/missionOne.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/missionOne.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/missionOne.oxw	7903-8175
/code/branches/libraries/data/levels/missionOne.oxw	5612-5692
/code/branches/libraries2/data/levels/missionOne.oxw	5703-5737
/code/branches/lod/data/levels/missionOne.oxw	6586-6911
/code/branches/lodfinal/data/levels/missionOne.oxw	2372-2411
/code/branches/mac_osx/data/levels/missionOne.oxw	7789-8128,8135
/code/branches/map/data/levels/missionOne.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/missionOne.oxw	7502-7738
/code/branches/menu/data/levels/missionOne.oxw	5941-6146,6148,7536-7687
/code/branches/menue/data/levels/missionOne.oxw	8884-8976
/code/branches/miniprojects/data/levels/missionOne.oxw	2754-2824
/code/branches/netp2/data/levels/missionOne.oxw	2835-2988
/code/branches/netp3/data/levels/missionOne.oxw	2988-3082
/code/branches/netp6/data/levels/missionOne.oxw	3214-3302
/code/branches/network/data/levels/missionOne.oxw	2356
/code/branches/network2/data/levels/missionOne.oxw	6434-6465
/code/branches/network3/data/levels/missionOne.oxw	7196-7344
/code/branches/network4/data/levels/missionOne.oxw	7497-7755
/code/branches/network5/data/levels/missionOne.oxw	7757-7781
/code/branches/network6/data/levels/missionOne.oxw	7823-8315
/code/branches/network64/data/levels/missionOne.oxw	2210-2355
/code/branches/notifications/data/levels/missionOne.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/missionOne.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/missionOne.oxw	2171-2479
/code/branches/ois_update/data/levels/missionOne.oxw	7506-7788
/code/branches/output/data/levels/missionOne.oxw	8739-8857
/code/branches/overlay/data/levels/missionOne.oxw	2117-2385
/code/branches/particles/data/levels/missionOne.oxw	2829-3085
/code/branches/particles2/data/levels/missionOne.oxw	6050-6106,6109
/code/branches/pch/data/levels/missionOne.oxw	3113-3194
/code/branches/physics/data/levels/missionOne.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/missionOne.oxw	2436-2457
/code/branches/pickup/data/levels/missionOne.oxw	8145-8555
/code/branches/pickup2/data/levels/missionOne.oxw	5942-6405
/code/branches/pickup3/data/levels/missionOne.oxw	6418-6523
/code/branches/pickup4/data/levels/missionOne.oxw	6594-6710
/code/branches/pickups/data/levels/missionOne.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/missionOne.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/missionOne.oxw	7262-7263
/code/branches/portals/data/levels/missionOne.oxw	8087-8455
/code/branches/portals2/data/levels/missionOne.oxw	8460-8602
/code/branches/ppspickups1/data/levels/missionOne.oxw	6552-6708
/code/branches/ppspickups2/data/levels/missionOne.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/missionOne.oxw	6757-6997
/code/branches/ppspickups4/data/levels/missionOne.oxw	7003-7089
/code/branches/presentation/data/levels/missionOne.oxw	2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/missionOne.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/missionOne.oxw	6913-7162
/code/branches/questsystem/data/levels/missionOne.oxw	1894-2088
/code/branches/questsystem2/data/levels/missionOne.oxw	2107-2259
/code/branches/questsystem5/data/levels/missionOne.oxw	2776-2905
/code/branches/releasetodo/data/levels/missionOne.oxw	7614-7647
/code/branches/resource/data/levels/missionOne.oxw	3327-3366
/code/branches/resource2/data/levels/missionOne.oxw	3372-5694
/code/branches/rocket/data/levels/missionOne.oxw	6523-6950
/code/branches/rocket2/data/levels/missionOne.oxw	6953-6970
/code/branches/script_trigger/data/levels/missionOne.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/missionOne.oxw	6559-6989
/code/branches/sound/data/levels/missionOne.oxw	2829-3010
/code/branches/sound3/data/levels/missionOne.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/missionOne.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/missionOne.oxw	8460-8613
/code/branches/spacerace/data/levels/missionOne.oxw	8182-8630
/code/branches/spaceraceTwo/data/levels/missionOne.oxw	8881-8996
/code/branches/steering/data/levels/missionOne.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/missionOne.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/missionOne.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/missionOne.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/missionOne.oxw	8453-8636
/code/branches/unity_build/data/levels/missionOne.oxw	8440-8716
/code/branches/usability/data/levels/missionOne.oxw	7915-8078
/code/branches/weapon/data/levels/missionOne.oxw	1925-2094
/code/branches/weapon2/data/levels/missionOne.oxw	2107-2488
/code/branches/weapons/data/levels/missionOne.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/missionOne.oxw	2742-2890

code/branches/presentation2012/data/levels/myTestLevel.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/formation/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/gamecontent/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/hud/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/menue/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/output/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/pickup2012/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/presentation/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/presentation2011/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/shipSelection/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/sound2012/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/spacegate/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/myTestLevel.oxw	merged	eligible
/code/trunk/data/levels/myTestLevel.oxw	merged	eligible
/code/branches/ai/data/levels/myTestLevel.oxw	6592-7033
/code/branches/ai2/data/levels/myTestLevel.oxw	8721-8880
/code/branches/bigships/data/levels/myTestLevel.oxw	8137-8588
/code/branches/buildsystem/data/levels/myTestLevel.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/myTestLevel.oxw	2506-2658
/code/branches/buildsystem3/data/levels/myTestLevel.oxw	2662-2708
/code/branches/ceguilua/data/levels/myTestLevel.oxw	1802-1808
/code/branches/chat/data/levels/myTestLevel.oxw	6527-6797
/code/branches/chat2/data/levels/myTestLevel.oxw	6836-6910
/code/branches/console/data/levels/myTestLevel.oxw	5941-6104
/code/branches/consolecommands2/data/levels/myTestLevel.oxw	6451-7178
/code/branches/consolecommands3/data/levels/myTestLevel.oxw	7178-7283
/code/branches/core3/data/levels/myTestLevel.oxw	1572-1739
/code/branches/core4/data/levels/myTestLevel.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/myTestLevel.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/myTestLevel.oxw	7537-7686
/code/branches/doc/data/levels/myTestLevel.oxw	7290-7400
/code/branches/dockingsystem/data/levels/myTestLevel.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/myTestLevel.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/myTestLevel.oxw	6584-7030
/code/branches/fps/data/levels/myTestLevel.oxw	6591-7072
/code/branches/gameimmersion/data/levels/myTestLevel.oxw	8102-8577
/code/branches/gamestate/data/levels/myTestLevel.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/myTestLevel.oxw	6594-6745
/code/branches/gametypes/data/levels/myTestLevel.oxw	2826-3031
/code/branches/gcc43/data/levels/myTestLevel.oxw	1580
/code/branches/gui/data/levels/myTestLevel.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/myTestLevel.oxw	6584-6941
/code/branches/hudimprovements/data/levels/myTestLevel.oxw	7920-8672
/code/branches/ingamemenu/data/levels/myTestLevel.oxw	6000-6023
/code/branches/input/data/levels/myTestLevel.oxw	1629-1636
/code/branches/ipv6/data/levels/myTestLevel.oxw	7293-7458
/code/branches/kicklib/data/levels/myTestLevel.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/myTestLevel.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/myTestLevel.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/myTestLevel.oxw	7903-8175
/code/branches/libraries/data/levels/myTestLevel.oxw	5612-5692
/code/branches/libraries2/data/levels/myTestLevel.oxw	5703-5737
/code/branches/lod/data/levels/myTestLevel.oxw	6586-6911
/code/branches/lodfinal/data/levels/myTestLevel.oxw	2372-2411
/code/branches/mac_osx/data/levels/myTestLevel.oxw	7789-8128,8135
/code/branches/map/data/levels/myTestLevel.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/myTestLevel.oxw	7502-7738
/code/branches/menu/data/levels/myTestLevel.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/myTestLevel.oxw	2754-2824
/code/branches/netp2/data/levels/myTestLevel.oxw	2835-2988
/code/branches/netp3/data/levels/myTestLevel.oxw	2988-3082
/code/branches/netp6/data/levels/myTestLevel.oxw	3214-3302
/code/branches/network/data/levels/myTestLevel.oxw	2356
/code/branches/network2/data/levels/myTestLevel.oxw	6434-6465
/code/branches/network3/data/levels/myTestLevel.oxw	7196-7344
/code/branches/network4/data/levels/myTestLevel.oxw	7497-7755
/code/branches/network5/data/levels/myTestLevel.oxw	7757-7781
/code/branches/network6/data/levels/myTestLevel.oxw	7823-8315
/code/branches/network64/data/levels/myTestLevel.oxw	2210-2355
/code/branches/notifications/data/levels/myTestLevel.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/myTestLevel.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/myTestLevel.oxw	2171-2479
/code/branches/ois_update/data/levels/myTestLevel.oxw	7506-7788
/code/branches/overlay/data/levels/myTestLevel.oxw	2117-2385
/code/branches/particles/data/levels/myTestLevel.oxw	2829-3085
/code/branches/particles2/data/levels/myTestLevel.oxw	6050-6106,6109
/code/branches/pch/data/levels/myTestLevel.oxw	3113-3194
/code/branches/physics/data/levels/myTestLevel.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/myTestLevel.oxw	2436-2457
/code/branches/pickup/data/levels/myTestLevel.oxw	8145-8555
/code/branches/pickup2/data/levels/myTestLevel.oxw	5942-6405
/code/branches/pickup3/data/levels/myTestLevel.oxw	6418-6523
/code/branches/pickup4/data/levels/myTestLevel.oxw	6594-6710
/code/branches/pickups/data/levels/myTestLevel.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/myTestLevel.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/myTestLevel.oxw	7262-7263
/code/branches/portals/data/levels/myTestLevel.oxw	8087-8455
/code/branches/portals2/data/levels/myTestLevel.oxw	8460-8602
/code/branches/ppspickups1/data/levels/myTestLevel.oxw	6552-6708
/code/branches/ppspickups2/data/levels/myTestLevel.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/myTestLevel.oxw	6757-6997
/code/branches/ppspickups4/data/levels/myTestLevel.oxw	7003-7089
/code/branches/presentation2/data/levels/myTestLevel.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/myTestLevel.oxw	6913-7162
/code/branches/questsystem/data/levels/myTestLevel.oxw	1894-2088
/code/branches/questsystem2/data/levels/myTestLevel.oxw	2107-2259
/code/branches/questsystem5/data/levels/myTestLevel.oxw	2776-2905
/code/branches/releasetodo/data/levels/myTestLevel.oxw	7614-7647
/code/branches/resource/data/levels/myTestLevel.oxw	3327-3366
/code/branches/resource2/data/levels/myTestLevel.oxw	3372-5694
/code/branches/rocket/data/levels/myTestLevel.oxw	6523-6950
/code/branches/rocket2/data/levels/myTestLevel.oxw	6953-6970
/code/branches/script_trigger/data/levels/myTestLevel.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/myTestLevel.oxw	6559-6989
/code/branches/sound/data/levels/myTestLevel.oxw	2829-3010
/code/branches/sound3/data/levels/myTestLevel.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/myTestLevel.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/myTestLevel.oxw	8460-8613
/code/branches/spacerace/data/levels/myTestLevel.oxw	8182-8630
/code/branches/steering/data/levels/myTestLevel.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/myTestLevel.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/myTestLevel.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/myTestLevel.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/myTestLevel.oxw	8453-8636
/code/branches/unity_build/data/levels/myTestLevel.oxw	8440-8716
/code/branches/usability/data/levels/myTestLevel.oxw	7915-8078
/code/branches/weapon/data/levels/myTestLevel.oxw	1925-2094
/code/branches/weapon2/data/levels/myTestLevel.oxw	2107-2488
/code/branches/weapons/data/levels/myTestLevel.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/myTestLevel.oxw	2742-2890

code/branches/presentation2012/data/levels/notifications.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/notifications.oxw	merged	eligible
/code/branches/environment3/data/levels/notifications.oxw	merged	eligible
/code/branches/formation/data/levels/notifications.oxw	merged	eligible
/code/branches/gamecontent/data/levels/notifications.oxw	merged	eligible
/code/branches/hud/data/levels/notifications.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/notifications.oxw	merged	eligible
/code/branches/menue/data/levels/notifications.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/notifications.oxw	merged	eligible
/code/branches/output/data/levels/notifications.oxw	merged	eligible
/code/branches/pickup2012/data/levels/notifications.oxw	merged	eligible
/code/branches/presentation/data/levels/notifications.oxw	merged	eligible
/code/branches/presentation2011/data/levels/notifications.oxw	merged	eligible
/code/branches/shipSelection/data/levels/notifications.oxw	merged	eligible
/code/branches/sound2012/data/levels/notifications.oxw	merged	eligible
/code/branches/spacegate/data/levels/notifications.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/notifications.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/notifications.oxw	merged	eligible
/code/branches/usability/data/levels/notifications.oxw	merged	eligible
/code/trunk/data/levels/notifications.oxw	merged	eligible
/code/branches/ai/data/levels/notifications.oxw	6592-7033
/code/branches/ai2/data/levels/notifications.oxw	8721-8880
/code/branches/bigships/data/levels/notifications.oxw	8137-8588
/code/branches/buildsystem/data/levels/notifications.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/notifications.oxw	2506-2658
/code/branches/buildsystem3/data/levels/notifications.oxw	2662-2708
/code/branches/ceguilua/data/levels/notifications.oxw	1802-1808
/code/branches/chat/data/levels/notifications.oxw	6527-6797
/code/branches/chat2/data/levels/notifications.oxw	6836-6910
/code/branches/console/data/levels/notifications.oxw	5941-6104
/code/branches/consolecommands2/data/levels/notifications.oxw	6451-7178
/code/branches/consolecommands3/data/levels/notifications.oxw	7178-7283
/code/branches/core3/data/levels/notifications.oxw	1572-1739
/code/branches/core4/data/levels/notifications.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/notifications.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/notifications.oxw	7537-7686
/code/branches/doc/data/levels/notifications.oxw	7290-7400
/code/branches/dockingsystem/data/levels/notifications.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/notifications.oxw	6584-7030
/code/branches/fps/data/levels/notifications.oxw	6591-7072
/code/branches/gameimmersion/data/levels/notifications.oxw	8102-8577
/code/branches/gamestate/data/levels/notifications.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/notifications.oxw	6594-6745
/code/branches/gametypes/data/levels/notifications.oxw	2826-3031
/code/branches/gcc43/data/levels/notifications.oxw	1580
/code/branches/gui/data/levels/notifications.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/notifications.oxw	6584-6941
/code/branches/hudimprovements/data/levels/notifications.oxw	7920-8672
/code/branches/ingamemenu/data/levels/notifications.oxw	6000-6023
/code/branches/input/data/levels/notifications.oxw	1629-1636
/code/branches/ipv6/data/levels/notifications.oxw	7293-7458
/code/branches/kicklib/data/levels/notifications.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/notifications.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/notifications.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/notifications.oxw	7903-8175
/code/branches/libraries/data/levels/notifications.oxw	5612-5692
/code/branches/libraries2/data/levels/notifications.oxw	5703-5737
/code/branches/lod/data/levels/notifications.oxw	6586-6911
/code/branches/lodfinal/data/levels/notifications.oxw	2372-2411
/code/branches/mac_osx/data/levels/notifications.oxw	7789-8128,8135
/code/branches/map/data/levels/notifications.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/notifications.oxw	7502-7738
/code/branches/menu/data/levels/notifications.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/notifications.oxw	2754-2824
/code/branches/netp2/data/levels/notifications.oxw	2835-2988
/code/branches/netp3/data/levels/notifications.oxw	2988-3082
/code/branches/netp6/data/levels/notifications.oxw	3214-3302
/code/branches/network/data/levels/notifications.oxw	2356
/code/branches/network2/data/levels/notifications.oxw	6434-6465
/code/branches/network3/data/levels/notifications.oxw	7196-7344
/code/branches/network4/data/levels/notifications.oxw	7497-7755
/code/branches/network5/data/levels/notifications.oxw	7757-7781
/code/branches/network6/data/levels/notifications.oxw	7823-8315
/code/branches/network64/data/levels/notifications.oxw	2210-2355
/code/branches/notifications/data/levels/notifications.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/notifications.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/notifications.oxw	2171-2479
/code/branches/ois_update/data/levels/notifications.oxw	7506-7788
/code/branches/overlay/data/levels/notifications.oxw	2117-2385
/code/branches/particles/data/levels/notifications.oxw	2829-3085
/code/branches/particles2/data/levels/notifications.oxw	6050-6106,6109
/code/branches/pch/data/levels/notifications.oxw	3113-3194
/code/branches/physics/data/levels/notifications.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/notifications.oxw	2436-2457
/code/branches/pickup/data/levels/notifications.oxw	8145-8555
/code/branches/pickup2/data/levels/notifications.oxw	5942-6405
/code/branches/pickup3/data/levels/notifications.oxw	6418-6523
/code/branches/pickup4/data/levels/notifications.oxw	6594-6710
/code/branches/pickups/data/levels/notifications.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/notifications.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/notifications.oxw	7262-7263
/code/branches/portals/data/levels/notifications.oxw	8087-8455
/code/branches/portals2/data/levels/notifications.oxw	8460-8602
/code/branches/ppspickups1/data/levels/notifications.oxw	6552-6708
/code/branches/ppspickups2/data/levels/notifications.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/notifications.oxw	6757-6997
/code/branches/ppspickups4/data/levels/notifications.oxw	7003-7089
/code/branches/presentation2/data/levels/notifications.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/notifications.oxw	6913-7162
/code/branches/questsystem/data/levels/notifications.oxw	1894-2088
/code/branches/questsystem2/data/levels/notifications.oxw	2107-2259
/code/branches/questsystem5/data/levels/notifications.oxw	2776-2905
/code/branches/releasetodo/data/levels/notifications.oxw	7614-7647
/code/branches/resource/data/levels/notifications.oxw	3327-3366
/code/branches/resource2/data/levels/notifications.oxw	3372-5694
/code/branches/rocket/data/levels/notifications.oxw	6523-6950
/code/branches/rocket2/data/levels/notifications.oxw	6953-6970
/code/branches/script_trigger/data/levels/notifications.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/notifications.oxw	6559-6989
/code/branches/sound/data/levels/notifications.oxw	2829-3010
/code/branches/sound3/data/levels/notifications.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/notifications.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/notifications.oxw	8460-8613
/code/branches/spacerace/data/levels/notifications.oxw	8182-8630
/code/branches/steering/data/levels/notifications.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/notifications.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/notifications.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/notifications.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/notifications.oxw	8453-8636
/code/branches/unity_build/data/levels/notifications.oxw	8440-8716
/code/branches/weapon/data/levels/notifications.oxw	1925-2094
/code/branches/weapon2/data/levels/notifications.oxw	2107-2488
/code/branches/weapons/data/levels/notifications.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/notifications.oxw	2742-2890

code/branches/presentation2012/data/levels/old

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/old	merged	eligible
/code/branches/environment3/data/levels/old	merged	eligible
/code/branches/formation/data/levels/old	merged	eligible
/code/branches/gamecontent/data/levels/old	merged	eligible
/code/branches/hud/data/levels/old	merged	eligible
/code/branches/masterserverfix/data/levels/old	merged	eligible
/code/branches/menue/data/levels/old	merged	eligible
/code/branches/newlevel2012/data/levels/old	merged	eligible
/code/branches/output/data/levels/old	merged	eligible
/code/branches/pickup2012/data/levels/old	merged	eligible
/code/branches/presentation/data/levels/old	merged	eligible
/code/branches/presentation2011/data/levels/old	merged	eligible
/code/branches/shipSelection/data/levels/old	merged	eligible
/code/branches/sound2012/data/levels/old	merged	eligible
/code/branches/spacegate/data/levels/old	merged	eligible
/code/branches/spaceraceTwo/data/levels/old	merged	eligible
/code/branches/surfaceRace/data/levels/old	merged	eligible
/code/branches/usability/data/levels/old	merged	eligible
/code/trunk/data/levels/old	merged	eligible
/code/branches/ai/data/levels/old	6592-7033
/code/branches/ai2/data/levels/old	8721-8880
/code/branches/bigships/data/levels/old	8137-8588
/code/branches/buildsystem/data/levels/old	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/old	2506-2658
/code/branches/buildsystem3/data/levels/old	2662-2708
/code/branches/ceguilua/data/levels/old	1802-1808
/code/branches/chat/data/levels/old	6527-6797
/code/branches/chat2/data/levels/old	6836-6910
/code/branches/console/data/levels/old	5941-6104
/code/branches/consolecommands2/data/levels/old	6451-7178
/code/branches/consolecommands3/data/levels/old	7178-7283
/code/branches/core3/data/levels/old	1572-1739
/code/branches/core4/data/levels/old	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/old	5768-5928,6009
/code/branches/data_cleanup/data/levels/old	7537-7686
/code/branches/doc/data/levels/old	7290-7400
/code/branches/dockingsystem/data/levels/old	8101-8192
/code/branches/dynamicmatch/data/levels/old	6584-7030
/code/branches/fps/data/levels/old	6591-7072
/code/branches/gameimmersion/data/levels/old	8102-8577
/code/branches/gamestate/data/levels/old	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/old	6594-6745
/code/branches/gametypes/data/levels/old	2826-3031
/code/branches/gcc43/data/levels/old	1580
/code/branches/gui/data/levels/old	1635-1723,2795-2894
/code/branches/hudelements/data/levels/old	6584-6941
/code/branches/hudimprovements/data/levels/old	7920-8672
/code/branches/ingamemenu/data/levels/old	6000-6023
/code/branches/input/data/levels/old	1629-1636
/code/branches/ipv6/data/levels/old	7293-7458
/code/branches/kicklib/data/levels/old	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/old	8282-8350
/code/branches/lastmanstanding/data/levels/old	7479-7644
/code/branches/lastmanstanding3/data/levels/old	7903-8175
/code/branches/libraries/data/levels/old	5612-5692
/code/branches/libraries2/data/levels/old	5703-5737
/code/branches/lod/data/levels/old	6586-6911
/code/branches/lodfinal/data/levels/old	2372-2411
/code/branches/mac_osx/data/levels/old	7789-8128,8135
/code/branches/map/data/levels/old	2801-3086,3089
/code/branches/masterserver/data/levels/old	7502-7738
/code/branches/menu/data/levels/old	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/old	2754-2824
/code/branches/netp2/data/levels/old	2835-2988
/code/branches/netp3/data/levels/old	2988-3082
/code/branches/netp6/data/levels/old	3214-3302
/code/branches/network/data/levels/old	2356
/code/branches/network2/data/levels/old	6434-6465
/code/branches/network3/data/levels/old	7196-7344
/code/branches/network4/data/levels/old	7497-7755
/code/branches/network5/data/levels/old	7757-7781
/code/branches/network6/data/levels/old	7823-8315
/code/branches/network64/data/levels/old	2210-2355
/code/branches/notifications/data/levels/old	7314-7401
/code/branches/objecthierarchy/data/levels/old	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/old	2171-2479
/code/branches/ois_update/data/levels/old	7506-7788
/code/branches/overlay/data/levels/old	2117-2385
/code/branches/particles/data/levels/old	2829-3085
/code/branches/particles2/data/levels/old	6050-6106,6109
/code/branches/pch/data/levels/old	3113-3194
/code/branches/physics/data/levels/old	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/old	2436-2457
/code/branches/pickup/data/levels/old	8145-8555
/code/branches/pickup2/data/levels/old	5942-6405
/code/branches/pickup3/data/levels/old	6418-6523
/code/branches/pickup4/data/levels/old	6594-6710
/code/branches/pickups/data/levels/old	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/old	2107-2497,2915-3071
/code/branches/png2/data/levels/old	7262-7263
/code/branches/portals/data/levels/old	8087-8455
/code/branches/portals2/data/levels/old	8460-8602
/code/branches/ppspickups1/data/levels/old	6552-6708
/code/branches/ppspickups2/data/levels/old	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/old	6757-6997
/code/branches/ppspickups4/data/levels/old	7003-7089
/code/branches/presentation2/data/levels/old	6106-6416,7787-7800
/code/branches/presentation3/data/levels/old	6913-7162
/code/branches/questsystem/data/levels/old	1894-2088
/code/branches/questsystem2/data/levels/old	2107-2259
/code/branches/questsystem5/data/levels/old	2776-2905
/code/branches/releasetodo/data/levels/old	7614-7647
/code/branches/resource/data/levels/old	3327-3366
/code/branches/resource2/data/levels/old	3372-5694
/code/branches/rocket/data/levels/old	6523-6950
/code/branches/rocket2/data/levels/old	6953-6970
/code/branches/script_trigger/data/levels/old	1295-1953,1955
/code/branches/skybox2/data/levels/old	6559-6989
/code/branches/sound/data/levels/old	2829-3010
/code/branches/sound3/data/levels/old	5941-6102
/code/branches/spaceboundaries/data/levels/old	8085-8457
/code/branches/spaceboundaries2/data/levels/old	8460-8613
/code/branches/spacerace/data/levels/old	8182-8630
/code/branches/steering/data/levels/old	5949-6091,8140-8595
/code/branches/tetris/data/levels/old	8100-8563
/code/branches/tutoriallevel/data/levels/old	7827-8370
/code/branches/tutoriallevel2/data/levels/old	8370-8452
/code/branches/tutoriallevel3/data/levels/old	8453-8636
/code/branches/unity_build/data/levels/old	8440-8716
/code/branches/weapon/data/levels/old	1925-2094
/code/branches/weapon2/data/levels/old	2107-2488
/code/branches/weapons/data/levels/old	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/old	2742-2890

code/branches/presentation2012/data/levels/pickups.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/pickups.oxw	merged	eligible
/code/branches/environment3/data/levels/pickups.oxw	merged	eligible
/code/branches/formation/data/levels/pickups.oxw	merged	eligible
/code/branches/gamecontent/data/levels/pickups.oxw	merged	eligible
/code/branches/hud/data/levels/pickups.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/pickups.oxw	merged	eligible
/code/branches/menue/data/levels/pickups.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/pickups.oxw	merged	eligible
/code/branches/output/data/levels/pickups.oxw	merged	eligible
/code/branches/pickup2012/data/levels/pickups.oxw	merged	eligible
/code/branches/presentation/data/levels/pickups.oxw	merged	eligible
/code/branches/presentation2011/data/levels/pickups.oxw	merged	eligible
/code/branches/shipSelection/data/levels/pickups.oxw	merged	eligible
/code/branches/sound2012/data/levels/pickups.oxw	merged	eligible
/code/branches/spacegate/data/levels/pickups.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/pickups.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/pickups.oxw	merged	eligible
/code/branches/usability/data/levels/pickups.oxw	merged	eligible
/code/trunk/data/levels/pickups.oxw	merged	eligible
/code/branches/ai/data/levels/pickups.oxw	6592-7033
/code/branches/ai2/data/levels/pickups.oxw	8721-8880
/code/branches/bigships/data/levels/pickups.oxw	8137-8588
/code/branches/buildsystem/data/levels/pickups.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/pickups.oxw	2506-2658
/code/branches/buildsystem3/data/levels/pickups.oxw	2662-2708
/code/branches/ceguilua/data/levels/pickups.oxw	1802-1808
/code/branches/chat/data/levels/pickups.oxw	6527-6797
/code/branches/chat2/data/levels/pickups.oxw	6836-6910
/code/branches/console/data/levels/pickups.oxw	5941-6104
/code/branches/consolecommands2/data/levels/pickups.oxw	6451-7178
/code/branches/consolecommands3/data/levels/pickups.oxw	7178-7283
/code/branches/core3/data/levels/pickups.oxw	1572-1739
/code/branches/core4/data/levels/pickups.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/pickups.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/pickups.oxw	7537-7686
/code/branches/doc/data/levels/pickups.oxw	7290-7400
/code/branches/dockingsystem/data/levels/pickups.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/pickups.oxw	6584-7030
/code/branches/fps/data/levels/pickups.oxw	6591-7072
/code/branches/gameimmersion/data/levels/pickups.oxw	8102-8577
/code/branches/gamestate/data/levels/pickups.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/pickups.oxw	6594-6745
/code/branches/gametypes/data/levels/pickups.oxw	2826-3031
/code/branches/gcc43/data/levels/pickups.oxw	1580
/code/branches/gui/data/levels/pickups.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/pickups.oxw	6584-6941
/code/branches/hudimprovements/data/levels/pickups.oxw	7920-8672
/code/branches/ingamemenu/data/levels/pickups.oxw	6000-6023
/code/branches/input/data/levels/pickups.oxw	1629-1636
/code/branches/ipv6/data/levels/pickups.oxw	7293-7458
/code/branches/kicklib/data/levels/pickups.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/pickups.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/pickups.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/pickups.oxw	7903-8175
/code/branches/libraries/data/levels/pickups.oxw	5612-5692
/code/branches/libraries2/data/levels/pickups.oxw	5703-5737
/code/branches/lod/data/levels/pickups.oxw	6586-6911
/code/branches/lodfinal/data/levels/pickups.oxw	2372-2411
/code/branches/mac_osx/data/levels/pickups.oxw	7789-8128,8135
/code/branches/map/data/levels/pickups.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/pickups.oxw	7502-7738
/code/branches/menu/data/levels/pickups.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/pickups.oxw	2754-2824
/code/branches/netp2/data/levels/pickups.oxw	2835-2988
/code/branches/netp3/data/levels/pickups.oxw	2988-3082
/code/branches/netp6/data/levels/pickups.oxw	3214-3302
/code/branches/network/data/levels/pickups.oxw	2356
/code/branches/network2/data/levels/pickups.oxw	6434-6465
/code/branches/network3/data/levels/pickups.oxw	7196-7344
/code/branches/network4/data/levels/pickups.oxw	7497-7755
/code/branches/network5/data/levels/pickups.oxw	7757-7781
/code/branches/network6/data/levels/pickups.oxw	7823-8315
/code/branches/network64/data/levels/pickups.oxw	2210-2355
/code/branches/notifications/data/levels/pickups.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/pickups.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/pickups.oxw	2171-2479
/code/branches/ois_update/data/levels/pickups.oxw	7506-7788
/code/branches/overlay/data/levels/pickups.oxw	2117-2385
/code/branches/particles/data/levels/pickups.oxw	2829-3085
/code/branches/particles2/data/levels/pickups.oxw	6050-6106,6109
/code/branches/pch/data/levels/pickups.oxw	3113-3194
/code/branches/physics/data/levels/pickups.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/pickups.oxw	2436-2457
/code/branches/pickup/data/levels/pickups.oxw	8145-8555
/code/branches/pickup2/data/levels/pickups.oxw	5942-6405
/code/branches/pickup3/data/levels/pickups.oxw	6418-6523
/code/branches/pickup4/data/levels/pickups.oxw	6594-6710
/code/branches/pickups/data/levels/pickups.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/pickups.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/pickups.oxw	7262-7263
/code/branches/portals/data/levels/pickups.oxw	8087-8455
/code/branches/portals2/data/levels/pickups.oxw	8460-8602
/code/branches/ppspickups1/data/levels/pickups.oxw	6552-6708
/code/branches/ppspickups2/data/levels/pickups.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/pickups.oxw	6757-6997
/code/branches/ppspickups4/data/levels/pickups.oxw	7003-7089
/code/branches/presentation2/data/levels/pickups.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/pickups.oxw	6913-7162
/code/branches/questsystem/data/levels/pickups.oxw	1894-2088
/code/branches/questsystem2/data/levels/pickups.oxw	2107-2259
/code/branches/questsystem5/data/levels/pickups.oxw	2776-2905
/code/branches/releasetodo/data/levels/pickups.oxw	7614-7647
/code/branches/resource/data/levels/pickups.oxw	3327-3366
/code/branches/resource2/data/levels/pickups.oxw	3372-5694
/code/branches/rocket/data/levels/pickups.oxw	6523-6950
/code/branches/rocket2/data/levels/pickups.oxw	6953-6970
/code/branches/script_trigger/data/levels/pickups.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/pickups.oxw	6559-6989
/code/branches/sound/data/levels/pickups.oxw	2829-3010
/code/branches/sound3/data/levels/pickups.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/pickups.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/pickups.oxw	8460-8613
/code/branches/spacerace/data/levels/pickups.oxw	8182-8630
/code/branches/steering/data/levels/pickups.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/pickups.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/pickups.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/pickups.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/pickups.oxw	8453-8636
/code/branches/unity_build/data/levels/pickups.oxw	8440-8716
/code/branches/weapon/data/levels/pickups.oxw	1925-2094
/code/branches/weapon2/data/levels/pickups.oxw	2107-2488
/code/branches/weapons/data/levels/pickups.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/pickups.oxw	2742-2890

code/branches/presentation2012/data/levels/pirateAttack.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/environment3/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/formation/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/gamecontent/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/hud/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/menue/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/output/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/pickup2012/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/presentation/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/presentation2011/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/shipSelection/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/sound2012/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/spacegate/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/usability/data/levels/pirateAttack.oxw	merged	eligible
/code/trunk/data/levels/pirateAttack.oxw	merged	eligible
/code/branches/ai/data/levels/pirateAttack.oxw	6592-7033
/code/branches/ai2/data/levels/pirateAttack.oxw	8721-8880
/code/branches/bigships/data/levels/pirateAttack.oxw	8137-8588
/code/branches/buildsystem/data/levels/pirateAttack.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/pirateAttack.oxw	2506-2658
/code/branches/buildsystem3/data/levels/pirateAttack.oxw	2662-2708
/code/branches/ceguilua/data/levels/pirateAttack.oxw	1802-1808
/code/branches/chat/data/levels/pirateAttack.oxw	6527-6797
/code/branches/chat2/data/levels/pirateAttack.oxw	6836-6910
/code/branches/console/data/levels/pirateAttack.oxw	5941-6104
/code/branches/consolecommands2/data/levels/pirateAttack.oxw	6451-7178
/code/branches/consolecommands3/data/levels/pirateAttack.oxw	7178-7283
/code/branches/core3/data/levels/pirateAttack.oxw	1572-1739
/code/branches/core4/data/levels/pirateAttack.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/pirateAttack.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/pirateAttack.oxw	7537-7686
/code/branches/doc/data/levels/pirateAttack.oxw	7290-7400
/code/branches/dockingsystem/data/levels/pirateAttack.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/pirateAttack.oxw	6584-7030
/code/branches/fps/data/levels/pirateAttack.oxw	6591-7072
/code/branches/gameimmersion/data/levels/pirateAttack.oxw	8102-8577
/code/branches/gamestate/data/levels/pirateAttack.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/pirateAttack.oxw	6594-6745
/code/branches/gametypes/data/levels/pirateAttack.oxw	2826-3031
/code/branches/gcc43/data/levels/pirateAttack.oxw	1580
/code/branches/gui/data/levels/pirateAttack.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/pirateAttack.oxw	6584-6941
/code/branches/hudimprovements/data/levels/pirateAttack.oxw	7920-8672
/code/branches/ingamemenu/data/levels/pirateAttack.oxw	6000-6023
/code/branches/input/data/levels/pirateAttack.oxw	1629-1636
/code/branches/ipv6/data/levels/pirateAttack.oxw	7293-7458
/code/branches/kicklib/data/levels/pirateAttack.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/pirateAttack.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/pirateAttack.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/pirateAttack.oxw	7903-8175
/code/branches/libraries/data/levels/pirateAttack.oxw	5612-5692
/code/branches/libraries2/data/levels/pirateAttack.oxw	5703-5737
/code/branches/lod/data/levels/pirateAttack.oxw	6586-6911
/code/branches/lodfinal/data/levels/pirateAttack.oxw	2372-2411
/code/branches/mac_osx/data/levels/pirateAttack.oxw	7789-8128,8135
/code/branches/map/data/levels/pirateAttack.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/pirateAttack.oxw	7502-7738
/code/branches/menu/data/levels/pirateAttack.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/pirateAttack.oxw	2754-2824
/code/branches/netp2/data/levels/pirateAttack.oxw	2835-2988
/code/branches/netp3/data/levels/pirateAttack.oxw	2988-3082
/code/branches/netp6/data/levels/pirateAttack.oxw	3214-3302
/code/branches/network/data/levels/pirateAttack.oxw	2356
/code/branches/network2/data/levels/pirateAttack.oxw	6434-6465
/code/branches/network3/data/levels/pirateAttack.oxw	7196-7344
/code/branches/network4/data/levels/pirateAttack.oxw	7497-7755
/code/branches/network5/data/levels/pirateAttack.oxw	7757-7781
/code/branches/network6/data/levels/pirateAttack.oxw	7823-8315
/code/branches/network64/data/levels/pirateAttack.oxw	2210-2355
/code/branches/notifications/data/levels/pirateAttack.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/pirateAttack.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/pirateAttack.oxw	2171-2479
/code/branches/ois_update/data/levels/pirateAttack.oxw	7506-7788
/code/branches/overlay/data/levels/pirateAttack.oxw	2117-2385
/code/branches/particles/data/levels/pirateAttack.oxw	2829-3085
/code/branches/particles2/data/levels/pirateAttack.oxw	6050-6106,6109
/code/branches/pch/data/levels/pirateAttack.oxw	3113-3194
/code/branches/physics/data/levels/pirateAttack.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/pirateAttack.oxw	2436-2457
/code/branches/pickup/data/levels/pirateAttack.oxw	8145-8555
/code/branches/pickup2/data/levels/pirateAttack.oxw	5942-6405
/code/branches/pickup3/data/levels/pirateAttack.oxw	6418-6523
/code/branches/pickup4/data/levels/pirateAttack.oxw	6594-6710
/code/branches/pickups/data/levels/pirateAttack.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/pirateAttack.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/pirateAttack.oxw	7262-7263
/code/branches/portals/data/levels/pirateAttack.oxw	8087-8455
/code/branches/portals2/data/levels/pirateAttack.oxw	8460-8602
/code/branches/ppspickups1/data/levels/pirateAttack.oxw	6552-6708
/code/branches/ppspickups2/data/levels/pirateAttack.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/pirateAttack.oxw	6757-6997
/code/branches/ppspickups4/data/levels/pirateAttack.oxw	7003-7089
/code/branches/presentation2/data/levels/pirateAttack.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/pirateAttack.oxw	6913-7162
/code/branches/questsystem/data/levels/pirateAttack.oxw	1894-2088
/code/branches/questsystem2/data/levels/pirateAttack.oxw	2107-2259
/code/branches/questsystem5/data/levels/pirateAttack.oxw	2776-2905
/code/branches/releasetodo/data/levels/pirateAttack.oxw	7614-7647
/code/branches/resource/data/levels/pirateAttack.oxw	3327-3366
/code/branches/resource2/data/levels/pirateAttack.oxw	3372-5694
/code/branches/rocket/data/levels/pirateAttack.oxw	6523-6950
/code/branches/rocket2/data/levels/pirateAttack.oxw	6953-6970
/code/branches/script_trigger/data/levels/pirateAttack.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/pirateAttack.oxw	6559-6989
/code/branches/sound/data/levels/pirateAttack.oxw	2829-3010
/code/branches/sound3/data/levels/pirateAttack.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/pirateAttack.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/pirateAttack.oxw	8460-8613
/code/branches/spacerace/data/levels/pirateAttack.oxw	8182-8630
/code/branches/steering/data/levels/pirateAttack.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/pirateAttack.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/pirateAttack.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/pirateAttack.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/pirateAttack.oxw	8453-8636
/code/branches/unity_build/data/levels/pirateAttack.oxw	8440-8716
/code/branches/weapon/data/levels/pirateAttack.oxw	1925-2094
/code/branches/weapon2/data/levels/pirateAttack.oxw	2107-2488
/code/branches/weapons/data/levels/pirateAttack.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/pirateAttack.oxw	2742-2890

code/branches/presentation2012/data/levels/planets.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/planets.oxw	merged	eligible
/code/branches/formation/data/levels/planets.oxw	merged	eligible
/code/branches/gamecontent/data/levels/planets.oxw	merged	eligible
/code/branches/hud/data/levels/planets.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/planets.oxw	merged	eligible
/code/branches/menue/data/levels/planets.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/planets.oxw	merged	eligible
/code/branches/output/data/levels/planets.oxw	merged	eligible
/code/branches/pickup2012/data/levels/planets.oxw	merged	eligible
/code/branches/presentation/data/levels/planets.oxw	merged	eligible
/code/branches/presentation2011/data/levels/planets.oxw	merged	eligible
/code/branches/shipSelection/data/levels/planets.oxw	merged	eligible
/code/branches/sound2012/data/levels/planets.oxw	merged	eligible
/code/branches/spacegate/data/levels/planets.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/planets.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/planets.oxw	merged	eligible
/code/trunk/data/levels/planets.oxw	merged	eligible
/code/branches/ai/data/levels/planets.oxw	6592-7033
/code/branches/ai2/data/levels/planets.oxw	8721-8880
/code/branches/bigships/data/levels/planets.oxw	8137-8588
/code/branches/buildsystem/data/levels/planets.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/planets.oxw	2506-2658
/code/branches/buildsystem3/data/levels/planets.oxw	2662-2708
/code/branches/ceguilua/data/levels/planets.oxw	1802-1808
/code/branches/chat/data/levels/planets.oxw	6527-6797
/code/branches/chat2/data/levels/planets.oxw	6836-6910
/code/branches/console/data/levels/planets.oxw	5941-6104
/code/branches/consolecommands2/data/levels/planets.oxw	6451-7178
/code/branches/consolecommands3/data/levels/planets.oxw	7178-7283
/code/branches/core3/data/levels/planets.oxw	1572-1739
/code/branches/core4/data/levels/planets.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/planets.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/planets.oxw	7537-7686
/code/branches/doc/data/levels/planets.oxw	7290-7400
/code/branches/dockingsystem/data/levels/planets.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/planets.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/planets.oxw	6584-7030
/code/branches/fps/data/levels/planets.oxw	6591-7072
/code/branches/gameimmersion/data/levels/planets.oxw	8102-8577
/code/branches/gamestate/data/levels/planets.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/planets.oxw	6594-6745
/code/branches/gametypes/data/levels/planets.oxw	2826-3031
/code/branches/gcc43/data/levels/planets.oxw	1580
/code/branches/gui/data/levels/planets.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/planets.oxw	6584-6941
/code/branches/hudimprovements/data/levels/planets.oxw	7920-8672
/code/branches/ingamemenu/data/levels/planets.oxw	6000-6023
/code/branches/input/data/levels/planets.oxw	1629-1636
/code/branches/ipv6/data/levels/planets.oxw	7293-7458
/code/branches/kicklib/data/levels/planets.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/planets.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/planets.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/planets.oxw	7903-8175
/code/branches/libraries/data/levels/planets.oxw	5612-5692
/code/branches/libraries2/data/levels/planets.oxw	5703-5737
/code/branches/lod/data/levels/planets.oxw	6586-6911
/code/branches/lodfinal/data/levels/planets.oxw	2372-2411
/code/branches/mac_osx/data/levels/planets.oxw	7789-8128,8135
/code/branches/map/data/levels/planets.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/planets.oxw	7502-7738
/code/branches/menu/data/levels/planets.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/planets.oxw	2754-2824
/code/branches/netp2/data/levels/planets.oxw	2835-2988
/code/branches/netp3/data/levels/planets.oxw	2988-3082
/code/branches/netp6/data/levels/planets.oxw	3214-3302
/code/branches/network/data/levels/planets.oxw	2356
/code/branches/network2/data/levels/planets.oxw	6434-6465
/code/branches/network3/data/levels/planets.oxw	7196-7344
/code/branches/network4/data/levels/planets.oxw	7497-7755
/code/branches/network5/data/levels/planets.oxw	7757-7781
/code/branches/network6/data/levels/planets.oxw	7823-8315
/code/branches/network64/data/levels/planets.oxw	2210-2355
/code/branches/notifications/data/levels/planets.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/planets.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/planets.oxw	2171-2479
/code/branches/ois_update/data/levels/planets.oxw	7506-7788
/code/branches/overlay/data/levels/planets.oxw	2117-2385
/code/branches/particles/data/levels/planets.oxw	2829-3085
/code/branches/particles2/data/levels/planets.oxw	6050-6106,6109
/code/branches/pch/data/levels/planets.oxw	3113-3194
/code/branches/physics/data/levels/planets.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/planets.oxw	2436-2457
/code/branches/pickup/data/levels/planets.oxw	8145-8555
/code/branches/pickup2/data/levels/planets.oxw	5942-6405
/code/branches/pickup3/data/levels/planets.oxw	6418-6523
/code/branches/pickup4/data/levels/planets.oxw	6594-6710
/code/branches/pickups/data/levels/planets.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/planets.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/planets.oxw	7262-7263
/code/branches/portals/data/levels/planets.oxw	8087-8455
/code/branches/portals2/data/levels/planets.oxw	8460-8602
/code/branches/ppspickups1/data/levels/planets.oxw	6552-6708
/code/branches/ppspickups2/data/levels/planets.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/planets.oxw	6757-6997
/code/branches/ppspickups4/data/levels/planets.oxw	7003-7089
/code/branches/presentation2/data/levels/planets.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/planets.oxw	6913-7162
/code/branches/questsystem/data/levels/planets.oxw	1894-2088
/code/branches/questsystem2/data/levels/planets.oxw	2107-2259
/code/branches/questsystem5/data/levels/planets.oxw	2776-2905
/code/branches/releasetodo/data/levels/planets.oxw	7614-7647
/code/branches/resource/data/levels/planets.oxw	3327-3366
/code/branches/resource2/data/levels/planets.oxw	3372-5694
/code/branches/rocket/data/levels/planets.oxw	6523-6950
/code/branches/rocket2/data/levels/planets.oxw	6953-6970
/code/branches/script_trigger/data/levels/planets.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/planets.oxw	6559-6989
/code/branches/sound/data/levels/planets.oxw	2829-3010
/code/branches/sound3/data/levels/planets.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/planets.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/planets.oxw	8460-8613
/code/branches/spacerace/data/levels/planets.oxw	8182-8630
/code/branches/steering/data/levels/planets.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/planets.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/planets.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/planets.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/planets.oxw	8453-8636
/code/branches/unity_build/data/levels/planets.oxw	8440-8716
/code/branches/usability/data/levels/planets.oxw	7915-8078
/code/branches/weapon/data/levels/planets.oxw	1925-2094
/code/branches/weapon2/data/levels/planets.oxw	2107-2488
/code/branches/weapons/data/levels/planets.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/planets.oxw	2742-2890

code/branches/presentation2012/data/levels/pong.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/pong.oxw	merged	eligible
/code/branches/environment3/data/levels/pong.oxw	merged	eligible
/code/branches/formation/data/levels/pong.oxw	merged	eligible
/code/branches/gamecontent/data/levels/pong.oxw	merged	eligible
/code/branches/hud/data/levels/pong.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/pong.oxw	merged	eligible
/code/branches/menue/data/levels/pong.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/pong.oxw	merged	eligible
/code/branches/output/data/levels/pong.oxw	merged	eligible
/code/branches/pickup2012/data/levels/pong.oxw	merged	eligible
/code/branches/presentation/data/levels/pong.oxw	merged	eligible
/code/branches/presentation2011/data/levels/pong.oxw	merged	eligible
/code/branches/shipSelection/data/levels/pong.oxw	merged	eligible
/code/branches/sound2012/data/levels/pong.oxw	merged	eligible
/code/branches/spacegate/data/levels/pong.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/pong.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/pong.oxw	merged	eligible
/code/branches/usability/data/levels/pong.oxw	merged	eligible
/code/trunk/data/levels/pong.oxw	merged	eligible
/code/branches/ai/data/levels/pong.oxw	6592-7033
/code/branches/ai2/data/levels/pong.oxw	8721-8880
/code/branches/bigships/data/levels/pong.oxw	8137-8588
/code/branches/buildsystem/data/levels/pong.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/pong.oxw	2506-2658
/code/branches/buildsystem3/data/levels/pong.oxw	2662-2708
/code/branches/ceguilua/data/levels/pong.oxw	1802-1808
/code/branches/chat/data/levels/pong.oxw	6527-6797
/code/branches/chat2/data/levels/pong.oxw	6836-6910
/code/branches/console/data/levels/pong.oxw	5941-6104
/code/branches/consolecommands2/data/levels/pong.oxw	6451-7178
/code/branches/consolecommands3/data/levels/pong.oxw	7178-7283
/code/branches/core3/data/levels/pong.oxw	1572-1739
/code/branches/core4/data/levels/pong.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/pong.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/pong.oxw	7537-7686
/code/branches/doc/data/levels/pong.oxw	7290-7400
/code/branches/dockingsystem/data/levels/pong.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/pong.oxw	6584-7030
/code/branches/fps/data/levels/pong.oxw	6591-7072
/code/branches/gameimmersion/data/levels/pong.oxw	8102-8577
/code/branches/gamestate/data/levels/pong.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/pong.oxw	6594-6745
/code/branches/gametypes/data/levels/pong.oxw	2826-3031
/code/branches/gcc43/data/levels/pong.oxw	1580
/code/branches/gui/data/levels/pong.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/pong.oxw	6584-6941
/code/branches/hudimprovements/data/levels/pong.oxw	7920-8672
/code/branches/ingamemenu/data/levels/pong.oxw	6000-6023
/code/branches/input/data/levels/pong.oxw	1629-1636
/code/branches/ipv6/data/levels/pong.oxw	7293-7458
/code/branches/kicklib/data/levels/pong.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/pong.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/pong.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/pong.oxw	7903-8175
/code/branches/libraries/data/levels/pong.oxw	5612-5692
/code/branches/libraries2/data/levels/pong.oxw	5703-5737
/code/branches/lod/data/levels/pong.oxw	6586-6911
/code/branches/lodfinal/data/levels/pong.oxw	2372-2411
/code/branches/mac_osx/data/levels/pong.oxw	7789-8128,8135
/code/branches/map/data/levels/pong.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/pong.oxw	7502-7738
/code/branches/menu/data/levels/pong.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/pong.oxw	2754-2824
/code/branches/netp2/data/levels/pong.oxw	2835-2988
/code/branches/netp3/data/levels/pong.oxw	2988-3082
/code/branches/netp6/data/levels/pong.oxw	3214-3302
/code/branches/network/data/levels/pong.oxw	2356
/code/branches/network2/data/levels/pong.oxw	6434-6465
/code/branches/network3/data/levels/pong.oxw	7196-7344
/code/branches/network4/data/levels/pong.oxw	7497-7755
/code/branches/network5/data/levels/pong.oxw	7757-7781
/code/branches/network6/data/levels/pong.oxw	7823-8315
/code/branches/network64/data/levels/pong.oxw	2210-2355
/code/branches/notifications/data/levels/pong.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/pong.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/pong.oxw	2171-2479
/code/branches/ois_update/data/levels/pong.oxw	7506-7788
/code/branches/overlay/data/levels/pong.oxw	2117-2385
/code/branches/particles/data/levels/pong.oxw	2829-3085
/code/branches/particles2/data/levels/pong.oxw	6050-6106,6109
/code/branches/pch/data/levels/pong.oxw	3113-3194
/code/branches/physics/data/levels/pong.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/pong.oxw	2436-2457
/code/branches/pickup/data/levels/pong.oxw	8145-8555
/code/branches/pickup2/data/levels/pong.oxw	5942-6405
/code/branches/pickup3/data/levels/pong.oxw	6418-6523
/code/branches/pickup4/data/levels/pong.oxw	6594-6710
/code/branches/pickups/data/levels/pong.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/pong.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/pong.oxw	7262-7263
/code/branches/portals/data/levels/pong.oxw	8087-8455
/code/branches/portals2/data/levels/pong.oxw	8460-8602
/code/branches/ppspickups1/data/levels/pong.oxw	6552-6708
/code/branches/ppspickups2/data/levels/pong.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/pong.oxw	6757-6997
/code/branches/ppspickups4/data/levels/pong.oxw	7003-7089
/code/branches/presentation2/data/levels/pong.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/pong.oxw	6913-7162
/code/branches/questsystem/data/levels/pong.oxw	1894-2088
/code/branches/questsystem2/data/levels/pong.oxw	2107-2259
/code/branches/questsystem5/data/levels/pong.oxw	2776-2905
/code/branches/releasetodo/data/levels/pong.oxw	7614-7647
/code/branches/resource/data/levels/pong.oxw	3327-3366
/code/branches/resource2/data/levels/pong.oxw	3372-5694
/code/branches/rocket/data/levels/pong.oxw	6523-6950
/code/branches/rocket2/data/levels/pong.oxw	6953-6970
/code/branches/script_trigger/data/levels/pong.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/pong.oxw	6559-6989
/code/branches/sound/data/levels/pong.oxw	2829-3010
/code/branches/sound3/data/levels/pong.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/pong.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/pong.oxw	8460-8613
/code/branches/spacerace/data/levels/pong.oxw	8182-8630
/code/branches/steering/data/levels/pong.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/pong.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/pong.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/pong.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/pong.oxw	8453-8636
/code/branches/unity_build/data/levels/pong.oxw	8440-8716
/code/branches/weapon/data/levels/pong.oxw	1925-2094
/code/branches/weapon2/data/levels/pong.oxw	2107-2488
/code/branches/weapons/data/levels/pong.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/pong.oxw	2742-2890

code/branches/presentation2012/data/levels/portals.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/portals.oxw	merged	eligible
/code/branches/formation/data/levels/portals.oxw	merged	eligible
/code/branches/gamecontent/data/levels/portals.oxw	merged	eligible
/code/branches/hud/data/levels/portals.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/portals.oxw	merged	eligible
/code/branches/menue/data/levels/portals.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/portals.oxw	merged	eligible
/code/branches/output/data/levels/portals.oxw	merged	eligible
/code/branches/pickup2012/data/levels/portals.oxw	merged	eligible
/code/branches/presentation/data/levels/portals.oxw	merged	eligible
/code/branches/presentation2011/data/levels/portals.oxw	merged	eligible
/code/branches/shipSelection/data/levels/portals.oxw	merged	eligible
/code/branches/sound2012/data/levels/portals.oxw	merged	eligible
/code/branches/spacegate/data/levels/portals.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/portals.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/portals.oxw	merged	eligible
/code/trunk/data/levels/portals.oxw	merged	eligible
/code/branches/ai/data/levels/portals.oxw	6592-7033
/code/branches/ai2/data/levels/portals.oxw	8721-8880
/code/branches/bigships/data/levels/portals.oxw	8137-8588
/code/branches/buildsystem/data/levels/portals.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/portals.oxw	2506-2658
/code/branches/buildsystem3/data/levels/portals.oxw	2662-2708
/code/branches/ceguilua/data/levels/portals.oxw	1802-1808
/code/branches/chat/data/levels/portals.oxw	6527-6797
/code/branches/chat2/data/levels/portals.oxw	6836-6910
/code/branches/console/data/levels/portals.oxw	5941-6104
/code/branches/consolecommands2/data/levels/portals.oxw	6451-7178
/code/branches/consolecommands3/data/levels/portals.oxw	7178-7283
/code/branches/core3/data/levels/portals.oxw	1572-1739
/code/branches/core4/data/levels/portals.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/portals.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/portals.oxw	7537-7686
/code/branches/doc/data/levels/portals.oxw	7290-7400
/code/branches/dockingsystem/data/levels/portals.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/portals.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/portals.oxw	6584-7030
/code/branches/fps/data/levels/portals.oxw	6591-7072
/code/branches/gameimmersion/data/levels/portals.oxw	8102-8577
/code/branches/gamestate/data/levels/portals.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/portals.oxw	6594-6745
/code/branches/gametypes/data/levels/portals.oxw	2826-3031
/code/branches/gcc43/data/levels/portals.oxw	1580
/code/branches/gui/data/levels/portals.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/portals.oxw	6584-6941
/code/branches/hudimprovements/data/levels/portals.oxw	7920-8672
/code/branches/ingamemenu/data/levels/portals.oxw	6000-6023
/code/branches/input/data/levels/portals.oxw	1629-1636
/code/branches/ipv6/data/levels/portals.oxw	7293-7458
/code/branches/kicklib/data/levels/portals.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/portals.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/portals.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/portals.oxw	7903-8175
/code/branches/libraries/data/levels/portals.oxw	5612-5692
/code/branches/libraries2/data/levels/portals.oxw	5703-5737
/code/branches/lod/data/levels/portals.oxw	6586-6911
/code/branches/lodfinal/data/levels/portals.oxw	2372-2411
/code/branches/mac_osx/data/levels/portals.oxw	7789-8128,8135
/code/branches/map/data/levels/portals.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/portals.oxw	7502-7738
/code/branches/menu/data/levels/portals.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/portals.oxw	2754-2824
/code/branches/netp2/data/levels/portals.oxw	2835-2988
/code/branches/netp3/data/levels/portals.oxw	2988-3082
/code/branches/netp6/data/levels/portals.oxw	3214-3302
/code/branches/network/data/levels/portals.oxw	2356
/code/branches/network2/data/levels/portals.oxw	6434-6465
/code/branches/network3/data/levels/portals.oxw	7196-7344
/code/branches/network4/data/levels/portals.oxw	7497-7755
/code/branches/network5/data/levels/portals.oxw	7757-7781
/code/branches/network6/data/levels/portals.oxw	7823-8315
/code/branches/network64/data/levels/portals.oxw	2210-2355
/code/branches/notifications/data/levels/portals.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/portals.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/portals.oxw	2171-2479
/code/branches/ois_update/data/levels/portals.oxw	7506-7788
/code/branches/overlay/data/levels/portals.oxw	2117-2385
/code/branches/particles/data/levels/portals.oxw	2829-3085
/code/branches/particles2/data/levels/portals.oxw	6050-6106,6109
/code/branches/pch/data/levels/portals.oxw	3113-3194
/code/branches/physics/data/levels/portals.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/portals.oxw	2436-2457
/code/branches/pickup/data/levels/portals.oxw	8145-8555
/code/branches/pickup2/data/levels/portals.oxw	5942-6405
/code/branches/pickup3/data/levels/portals.oxw	6418-6523
/code/branches/pickup4/data/levels/portals.oxw	6594-6710
/code/branches/pickups/data/levels/portals.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/portals.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/portals.oxw	7262-7263
/code/branches/portals/data/levels/portals.oxw	8087-8455
/code/branches/portals2/data/levels/portals.oxw	8460-8602
/code/branches/ppspickups1/data/levels/portals.oxw	6552-6708
/code/branches/ppspickups2/data/levels/portals.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/portals.oxw	6757-6997
/code/branches/ppspickups4/data/levels/portals.oxw	7003-7089
/code/branches/presentation2/data/levels/portals.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/portals.oxw	6913-7162
/code/branches/questsystem/data/levels/portals.oxw	1894-2088
/code/branches/questsystem2/data/levels/portals.oxw	2107-2259
/code/branches/questsystem5/data/levels/portals.oxw	2776-2905
/code/branches/releasetodo/data/levels/portals.oxw	7614-7647
/code/branches/resource/data/levels/portals.oxw	3327-3366
/code/branches/resource2/data/levels/portals.oxw	3372-5694
/code/branches/rocket/data/levels/portals.oxw	6523-6950
/code/branches/rocket2/data/levels/portals.oxw	6953-6970
/code/branches/script_trigger/data/levels/portals.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/portals.oxw	6559-6989
/code/branches/sound/data/levels/portals.oxw	2829-3010
/code/branches/sound3/data/levels/portals.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/portals.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/portals.oxw	8460-8613
/code/branches/spacerace/data/levels/portals.oxw	8182-8630
/code/branches/steering/data/levels/portals.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/portals.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/portals.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/portals.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/portals.oxw	8453-8636
/code/branches/unity_build/data/levels/portals.oxw	8440-8716
/code/branches/usability/data/levels/portals.oxw	7915-8078
/code/branches/weapon/data/levels/portals.oxw	1925-2094
/code/branches/weapon2/data/levels/portals.oxw	2107-2488
/code/branches/weapons/data/levels/portals.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/portals.oxw	2742-2890

code/branches/presentation2012/data/levels/presentation.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/presentation.oxw	merged	eligible
/code/branches/environment3/data/levels/presentation.oxw	merged	eligible
/code/branches/formation/data/levels/presentation.oxw	merged	eligible
/code/branches/gamecontent/data/levels/presentation.oxw	merged	eligible
/code/branches/hud/data/levels/presentation.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/presentation.oxw	merged	eligible
/code/branches/menue/data/levels/presentation.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/presentation.oxw	merged	eligible
/code/branches/output/data/levels/presentation.oxw	merged	eligible
/code/branches/pickup2012/data/levels/presentation.oxw	merged	eligible
/code/branches/presentation/data/levels/presentation.oxw	merged	eligible
/code/branches/presentation2011/data/levels/presentation.oxw	merged	eligible
/code/branches/shipSelection/data/levels/presentation.oxw	merged	eligible
/code/branches/sound2012/data/levels/presentation.oxw	merged	eligible
/code/branches/spacegate/data/levels/presentation.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/presentation.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/presentation.oxw	merged	eligible
/code/branches/usability/data/levels/presentation.oxw	merged	eligible
/code/trunk/data/levels/presentation.oxw	merged	eligible
/code/branches/ai/data/levels/presentation.oxw	6592-7033
/code/branches/ai2/data/levels/presentation.oxw	8721-8880
/code/branches/bigships/data/levels/presentation.oxw	8137-8588
/code/branches/buildsystem/data/levels/presentation.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/presentation.oxw	2506-2658
/code/branches/buildsystem3/data/levels/presentation.oxw	2662-2708
/code/branches/ceguilua/data/levels/presentation.oxw	1802-1808
/code/branches/chat/data/levels/presentation.oxw	6527-6797
/code/branches/chat2/data/levels/presentation.oxw	6836-6910
/code/branches/console/data/levels/presentation.oxw	5941-6104
/code/branches/consolecommands2/data/levels/presentation.oxw	6451-7178
/code/branches/consolecommands3/data/levels/presentation.oxw	7178-7283
/code/branches/core3/data/levels/presentation.oxw	1572-1739
/code/branches/core4/data/levels/presentation.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/presentation.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/presentation.oxw	7537-7686
/code/branches/doc/data/levels/presentation.oxw	7290-7400
/code/branches/dockingsystem/data/levels/presentation.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/presentation.oxw	6584-7030
/code/branches/fps/data/levels/presentation.oxw	6591-7072
/code/branches/gameimmersion/data/levels/presentation.oxw	8102-8577
/code/branches/gamestate/data/levels/presentation.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/presentation.oxw	6594-6745
/code/branches/gametypes/data/levels/presentation.oxw	2826-3031
/code/branches/gcc43/data/levels/presentation.oxw	1580
/code/branches/gui/data/levels/presentation.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/presentation.oxw	6584-6941
/code/branches/hudimprovements/data/levels/presentation.oxw	7920-8672
/code/branches/ingamemenu/data/levels/presentation.oxw	6000-6023
/code/branches/input/data/levels/presentation.oxw	1629-1636
/code/branches/ipv6/data/levels/presentation.oxw	7293-7458
/code/branches/kicklib/data/levels/presentation.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/presentation.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/presentation.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/presentation.oxw	7903-8175
/code/branches/libraries/data/levels/presentation.oxw	5612-5692
/code/branches/libraries2/data/levels/presentation.oxw	5703-5737
/code/branches/lod/data/levels/presentation.oxw	6586-6911
/code/branches/lodfinal/data/levels/presentation.oxw	2372-2411
/code/branches/mac_osx/data/levels/presentation.oxw	7789-8128,8135
/code/branches/map/data/levels/presentation.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/presentation.oxw	7502-7738
/code/branches/menu/data/levels/presentation.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/presentation.oxw	2754-2824
/code/branches/netp2/data/levels/presentation.oxw	2835-2988
/code/branches/netp3/data/levels/presentation.oxw	2988-3082
/code/branches/netp6/data/levels/presentation.oxw	3214-3302
/code/branches/network/data/levels/presentation.oxw	2356
/code/branches/network2/data/levels/presentation.oxw	6434-6465
/code/branches/network3/data/levels/presentation.oxw	7196-7344
/code/branches/network4/data/levels/presentation.oxw	7497-7755
/code/branches/network5/data/levels/presentation.oxw	7757-7781
/code/branches/network6/data/levels/presentation.oxw	7823-8315
/code/branches/network64/data/levels/presentation.oxw	2210-2355
/code/branches/notifications/data/levels/presentation.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/presentation.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/presentation.oxw	2171-2479
/code/branches/ois_update/data/levels/presentation.oxw	7506-7788
/code/branches/overlay/data/levels/presentation.oxw	2117-2385
/code/branches/particles/data/levels/presentation.oxw	2829-3085
/code/branches/particles2/data/levels/presentation.oxw	6050-6106,6109
/code/branches/pch/data/levels/presentation.oxw	3113-3194
/code/branches/physics/data/levels/presentation.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/presentation.oxw	2436-2457
/code/branches/pickup/data/levels/presentation.oxw	8145-8555
/code/branches/pickup2/data/levels/presentation.oxw	5942-6405
/code/branches/pickup3/data/levels/presentation.oxw	6418-6523
/code/branches/pickup4/data/levels/presentation.oxw	6594-6710
/code/branches/pickups/data/levels/presentation.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/presentation.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/presentation.oxw	7262-7263
/code/branches/portals/data/levels/presentation.oxw	8087-8455
/code/branches/portals2/data/levels/presentation.oxw	8460-8602
/code/branches/ppspickups1/data/levels/presentation.oxw	6552-6708
/code/branches/ppspickups2/data/levels/presentation.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/presentation.oxw	6757-6997
/code/branches/ppspickups4/data/levels/presentation.oxw	7003-7089
/code/branches/presentation2/data/levels/presentation.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/presentation.oxw	6913-7162
/code/branches/questsystem/data/levels/presentation.oxw	1894-2088
/code/branches/questsystem2/data/levels/presentation.oxw	2107-2259
/code/branches/questsystem5/data/levels/presentation.oxw	2776-2905
/code/branches/releasetodo/data/levels/presentation.oxw	7614-7647
/code/branches/resource/data/levels/presentation.oxw	3327-3366
/code/branches/resource2/data/levels/presentation.oxw	3372-5694
/code/branches/rocket/data/levels/presentation.oxw	6523-6950
/code/branches/rocket2/data/levels/presentation.oxw	6953-6970
/code/branches/script_trigger/data/levels/presentation.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/presentation.oxw	6559-6989
/code/branches/sound/data/levels/presentation.oxw	2829-3010
/code/branches/sound3/data/levels/presentation.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/presentation.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/presentation.oxw	8460-8613
/code/branches/spacerace/data/levels/presentation.oxw	8182-8630
/code/branches/steering/data/levels/presentation.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/presentation.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/presentation.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/presentation.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/presentation.oxw	8453-8636
/code/branches/unity_build/data/levels/presentation.oxw	8440-8716
/code/branches/weapon/data/levels/presentation.oxw	1925-2094
/code/branches/weapon2/data/levels/presentation.oxw	2107-2488
/code/branches/weapons/data/levels/presentation.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/presentation.oxw	2742-2890

code/branches/presentation2012/data/levels/presentation09.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/presentation09.oxw	merged	eligible
/code/branches/environment3/data/levels/presentation09.oxw	merged	eligible
/code/branches/formation/data/levels/presentation09.oxw	merged	eligible
/code/branches/gamecontent/data/levels/presentation09.oxw	merged	eligible
/code/branches/hud/data/levels/presentation09.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/presentation09.oxw	merged	eligible
/code/branches/menue/data/levels/presentation09.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/presentation09.oxw	merged	eligible
/code/branches/output/data/levels/presentation09.oxw	merged	eligible
/code/branches/pickup2012/data/levels/presentation09.oxw	merged	eligible
/code/branches/presentation/data/levels/presentation09.oxw	merged	eligible
/code/branches/presentation2011/data/levels/presentation09.oxw	merged	eligible
/code/branches/shipSelection/data/levels/presentation09.oxw	merged	eligible
/code/branches/sound2012/data/levels/presentation09.oxw	merged	eligible
/code/branches/spacegate/data/levels/presentation09.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/presentation09.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/presentation09.oxw	merged	eligible
/code/branches/usability/data/levels/presentation09.oxw	merged	eligible
/code/trunk/data/levels/presentation09.oxw	merged	eligible
/code/branches/ai/data/levels/presentation09.oxw	6592-7033
/code/branches/ai2/data/levels/presentation09.oxw	8721-8880
/code/branches/bigships/data/levels/presentation09.oxw	8137-8588
/code/branches/buildsystem/data/levels/presentation09.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/presentation09.oxw	2506-2658
/code/branches/buildsystem3/data/levels/presentation09.oxw	2662-2708
/code/branches/ceguilua/data/levels/presentation09.oxw	1802-1808
/code/branches/chat/data/levels/presentation09.oxw	6527-6797
/code/branches/chat2/data/levels/presentation09.oxw	6836-6910
/code/branches/console/data/levels/presentation09.oxw	5941-6104
/code/branches/consolecommands2/data/levels/presentation09.oxw	6451-7178
/code/branches/consolecommands3/data/levels/presentation09.oxw	7178-7283
/code/branches/core3/data/levels/presentation09.oxw	1572-1739
/code/branches/core4/data/levels/presentation09.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/presentation09.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/presentation09.oxw	7537-7686
/code/branches/doc/data/levels/presentation09.oxw	7290-7400
/code/branches/dockingsystem/data/levels/presentation09.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/presentation09.oxw	6584-7030
/code/branches/fps/data/levels/presentation09.oxw	6591-7072
/code/branches/gameimmersion/data/levels/presentation09.oxw	8102-8577
/code/branches/gamestate/data/levels/presentation09.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/presentation09.oxw	6594-6745
/code/branches/gametypes/data/levels/presentation09.oxw	2826-3031
/code/branches/gcc43/data/levels/presentation09.oxw	1580
/code/branches/gui/data/levels/presentation09.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/presentation09.oxw	6584-6941
/code/branches/hudimprovements/data/levels/presentation09.oxw	7920-8672
/code/branches/ingamemenu/data/levels/presentation09.oxw	6000-6023
/code/branches/input/data/levels/presentation09.oxw	1629-1636
/code/branches/ipv6/data/levels/presentation09.oxw	7293-7458
/code/branches/kicklib/data/levels/presentation09.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/presentation09.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/presentation09.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/presentation09.oxw	7903-8175
/code/branches/libraries/data/levels/presentation09.oxw	5612-5692
/code/branches/libraries2/data/levels/presentation09.oxw	5703-5737
/code/branches/lod/data/levels/presentation09.oxw	6586-6911
/code/branches/lodfinal/data/levels/presentation09.oxw	2372-2411
/code/branches/mac_osx/data/levels/presentation09.oxw	7789-8128,8135
/code/branches/map/data/levels/presentation09.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/presentation09.oxw	7502-7738
/code/branches/menu/data/levels/presentation09.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/presentation09.oxw	2754-2824
/code/branches/netp2/data/levels/presentation09.oxw	2835-2988
/code/branches/netp3/data/levels/presentation09.oxw	2988-3082
/code/branches/netp6/data/levels/presentation09.oxw	3214-3302
/code/branches/network/data/levels/presentation09.oxw	2356
/code/branches/network2/data/levels/presentation09.oxw	6434-6465
/code/branches/network3/data/levels/presentation09.oxw	7196-7344
/code/branches/network4/data/levels/presentation09.oxw	7497-7755
/code/branches/network5/data/levels/presentation09.oxw	7757-7781
/code/branches/network6/data/levels/presentation09.oxw	7823-8315
/code/branches/network64/data/levels/presentation09.oxw	2210-2355
/code/branches/notifications/data/levels/presentation09.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/presentation09.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/presentation09.oxw	2171-2479
/code/branches/ois_update/data/levels/presentation09.oxw	7506-7788
/code/branches/overlay/data/levels/presentation09.oxw	2117-2385
/code/branches/particles/data/levels/presentation09.oxw	2829-3085
/code/branches/particles2/data/levels/presentation09.oxw	6050-6106,6109
/code/branches/pch/data/levels/presentation09.oxw	3113-3194
/code/branches/physics/data/levels/presentation09.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/presentation09.oxw	2436-2457
/code/branches/pickup/data/levels/presentation09.oxw	8145-8555
/code/branches/pickup2/data/levels/presentation09.oxw	5942-6405
/code/branches/pickup3/data/levels/presentation09.oxw	6418-6523
/code/branches/pickup4/data/levels/presentation09.oxw	6594-6710
/code/branches/pickups/data/levels/presentation09.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/presentation09.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/presentation09.oxw	7262-7263
/code/branches/portals/data/levels/presentation09.oxw	8087-8455
/code/branches/portals2/data/levels/presentation09.oxw	8460-8602
/code/branches/ppspickups1/data/levels/presentation09.oxw	6552-6708
/code/branches/ppspickups2/data/levels/presentation09.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/presentation09.oxw	6757-6997
/code/branches/ppspickups4/data/levels/presentation09.oxw	7003-7089
/code/branches/presentation2/data/levels/presentation09.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/presentation09.oxw	6913-7162
/code/branches/questsystem/data/levels/presentation09.oxw	1894-2088
/code/branches/questsystem2/data/levels/presentation09.oxw	2107-2259
/code/branches/questsystem5/data/levels/presentation09.oxw	2776-2905
/code/branches/releasetodo/data/levels/presentation09.oxw	7614-7647
/code/branches/resource/data/levels/presentation09.oxw	3327-3366
/code/branches/resource2/data/levels/presentation09.oxw	3372-5694
/code/branches/rocket/data/levels/presentation09.oxw	6523-6950
/code/branches/rocket2/data/levels/presentation09.oxw	6953-6970
/code/branches/script_trigger/data/levels/presentation09.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/presentation09.oxw	6559-6989
/code/branches/sound/data/levels/presentation09.oxw	2829-3010
/code/branches/sound3/data/levels/presentation09.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/presentation09.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/presentation09.oxw	8460-8613
/code/branches/spacerace/data/levels/presentation09.oxw	8182-8630
/code/branches/steering/data/levels/presentation09.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/presentation09.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/presentation09.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/presentation09.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/presentation09.oxw	8453-8636
/code/branches/unity_build/data/levels/presentation09.oxw	8440-8716
/code/branches/weapon/data/levels/presentation09.oxw	1925-2094
/code/branches/weapon2/data/levels/presentation09.oxw	2107-2488
/code/branches/weapons/data/levels/presentation09.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/presentation09.oxw	2742-2890

code/branches/presentation2012/data/levels/presentation09b.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/presentation09b.oxw	merged	eligible
/code/branches/environment3/data/levels/presentation09b.oxw	merged	eligible
/code/branches/formation/data/levels/presentation09b.oxw	merged	eligible
/code/branches/gamecontent/data/levels/presentation09b.oxw	merged	eligible
/code/branches/hud/data/levels/presentation09b.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/presentation09b.oxw	merged	eligible
/code/branches/menue/data/levels/presentation09b.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/presentation09b.oxw	merged	eligible
/code/branches/output/data/levels/presentation09b.oxw	merged	eligible
/code/branches/pickup2012/data/levels/presentation09b.oxw	merged	eligible
/code/branches/presentation/data/levels/presentation09b.oxw	merged	eligible
/code/branches/presentation2011/data/levels/presentation09b.oxw	merged	eligible
/code/branches/shipSelection/data/levels/presentation09b.oxw	merged	eligible
/code/branches/sound2012/data/levels/presentation09b.oxw	merged	eligible
/code/branches/spacegate/data/levels/presentation09b.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/presentation09b.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/presentation09b.oxw	merged	eligible
/code/branches/usability/data/levels/presentation09b.oxw	merged	eligible
/code/trunk/data/levels/presentation09b.oxw	merged	eligible
/code/branches/ai/data/levels/presentation09b.oxw	6592-7033
/code/branches/ai2/data/levels/presentation09b.oxw	8721-8880
/code/branches/bigships/data/levels/presentation09b.oxw	8137-8588
/code/branches/buildsystem/data/levels/presentation09b.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/presentation09b.oxw	2506-2658
/code/branches/buildsystem3/data/levels/presentation09b.oxw	2662-2708
/code/branches/ceguilua/data/levels/presentation09b.oxw	1802-1808
/code/branches/chat/data/levels/presentation09b.oxw	6527-6797
/code/branches/chat2/data/levels/presentation09b.oxw	6836-6910
/code/branches/console/data/levels/presentation09b.oxw	5941-6104
/code/branches/consolecommands2/data/levels/presentation09b.oxw	6451-7178
/code/branches/consolecommands3/data/levels/presentation09b.oxw	7178-7283
/code/branches/core3/data/levels/presentation09b.oxw	1572-1739
/code/branches/core4/data/levels/presentation09b.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/presentation09b.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/presentation09b.oxw	7537-7686
/code/branches/doc/data/levels/presentation09b.oxw	7290-7400
/code/branches/dockingsystem/data/levels/presentation09b.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/presentation09b.oxw	6584-7030
/code/branches/fps/data/levels/presentation09b.oxw	6591-7072
/code/branches/gameimmersion/data/levels/presentation09b.oxw	8102-8577
/code/branches/gamestate/data/levels/presentation09b.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/presentation09b.oxw	6594-6745
/code/branches/gametypes/data/levels/presentation09b.oxw	2826-3031
/code/branches/gcc43/data/levels/presentation09b.oxw	1580
/code/branches/gui/data/levels/presentation09b.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/presentation09b.oxw	6584-6941
/code/branches/hudimprovements/data/levels/presentation09b.oxw	7920-8672
/code/branches/ingamemenu/data/levels/presentation09b.oxw	6000-6023
/code/branches/input/data/levels/presentation09b.oxw	1629-1636
/code/branches/ipv6/data/levels/presentation09b.oxw	7293-7458
/code/branches/kicklib/data/levels/presentation09b.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/presentation09b.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/presentation09b.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/presentation09b.oxw	7903-8175
/code/branches/libraries/data/levels/presentation09b.oxw	5612-5692
/code/branches/libraries2/data/levels/presentation09b.oxw	5703-5737
/code/branches/lod/data/levels/presentation09b.oxw	6586-6911
/code/branches/lodfinal/data/levels/presentation09b.oxw	2372-2411
/code/branches/mac_osx/data/levels/presentation09b.oxw	7789-8128,8135
/code/branches/map/data/levels/presentation09b.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/presentation09b.oxw	7502-7738
/code/branches/menu/data/levels/presentation09b.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/presentation09b.oxw	2754-2824
/code/branches/netp2/data/levels/presentation09b.oxw	2835-2988
/code/branches/netp3/data/levels/presentation09b.oxw	2988-3082
/code/branches/netp6/data/levels/presentation09b.oxw	3214-3302
/code/branches/network/data/levels/presentation09b.oxw	2356
/code/branches/network2/data/levels/presentation09b.oxw	6434-6465
/code/branches/network3/data/levels/presentation09b.oxw	7196-7344
/code/branches/network4/data/levels/presentation09b.oxw	7497-7755
/code/branches/network5/data/levels/presentation09b.oxw	7757-7781
/code/branches/network6/data/levels/presentation09b.oxw	7823-8315
/code/branches/network64/data/levels/presentation09b.oxw	2210-2355
/code/branches/notifications/data/levels/presentation09b.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/presentation09b.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/presentation09b.oxw	2171-2479
/code/branches/ois_update/data/levels/presentation09b.oxw	7506-7788
/code/branches/overlay/data/levels/presentation09b.oxw	2117-2385
/code/branches/particles/data/levels/presentation09b.oxw	2829-3085
/code/branches/particles2/data/levels/presentation09b.oxw	6050-6106,6109
/code/branches/pch/data/levels/presentation09b.oxw	3113-3194
/code/branches/physics/data/levels/presentation09b.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/presentation09b.oxw	2436-2457
/code/branches/pickup/data/levels/presentation09b.oxw	8145-8555
/code/branches/pickup2/data/levels/presentation09b.oxw	5942-6405
/code/branches/pickup3/data/levels/presentation09b.oxw	6418-6523
/code/branches/pickup4/data/levels/presentation09b.oxw	6594-6710
/code/branches/pickups/data/levels/presentation09b.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/presentation09b.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/presentation09b.oxw	7262-7263
/code/branches/portals/data/levels/presentation09b.oxw	8087-8455
/code/branches/portals2/data/levels/presentation09b.oxw	8460-8602
/code/branches/ppspickups1/data/levels/presentation09b.oxw	6552-6708
/code/branches/ppspickups2/data/levels/presentation09b.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/presentation09b.oxw	6757-6997
/code/branches/ppspickups4/data/levels/presentation09b.oxw	7003-7089
/code/branches/presentation2/data/levels/presentation09b.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/presentation09b.oxw	6913-7162
/code/branches/questsystem/data/levels/presentation09b.oxw	1894-2088
/code/branches/questsystem2/data/levels/presentation09b.oxw	2107-2259
/code/branches/questsystem5/data/levels/presentation09b.oxw	2776-2905
/code/branches/releasetodo/data/levels/presentation09b.oxw	7614-7647
/code/branches/resource/data/levels/presentation09b.oxw	3327-3366
/code/branches/resource2/data/levels/presentation09b.oxw	3372-5694
/code/branches/rocket/data/levels/presentation09b.oxw	6523-6950
/code/branches/rocket2/data/levels/presentation09b.oxw	6953-6970
/code/branches/script_trigger/data/levels/presentation09b.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/presentation09b.oxw	6559-6989
/code/branches/sound/data/levels/presentation09b.oxw	2829-3010
/code/branches/sound3/data/levels/presentation09b.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/presentation09b.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/presentation09b.oxw	8460-8613
/code/branches/spacerace/data/levels/presentation09b.oxw	8182-8630
/code/branches/steering/data/levels/presentation09b.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/presentation09b.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/presentation09b.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/presentation09b.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/presentation09b.oxw	8453-8636
/code/branches/unity_build/data/levels/presentation09b.oxw	8440-8716
/code/branches/weapon/data/levels/presentation09b.oxw	1925-2094
/code/branches/weapon2/data/levels/presentation09b.oxw	2107-2488
/code/branches/weapons/data/levels/presentation09b.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/presentation09b.oxw	2742-2890

code/branches/presentation2012/data/levels/presentationDM.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/presentationDM.oxw	merged	eligible
/code/branches/environment3/data/levels/presentationDM.oxw	merged	eligible
/code/branches/formation/data/levels/presentationDM.oxw	merged	eligible
/code/branches/gamecontent/data/levels/presentationDM.oxw	merged	eligible
/code/branches/hud/data/levels/presentationDM.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/presentationDM.oxw	merged	eligible
/code/branches/menue/data/levels/presentationDM.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/presentationDM.oxw	merged	eligible
/code/branches/output/data/levels/presentationDM.oxw	merged	eligible
/code/branches/pickup2012/data/levels/presentationDM.oxw	merged	eligible
/code/branches/presentation/data/levels/presentationDM.oxw	merged	eligible
/code/branches/presentation2011/data/levels/presentationDM.oxw	merged	eligible
/code/branches/shipSelection/data/levels/presentationDM.oxw	merged	eligible
/code/branches/sound2012/data/levels/presentationDM.oxw	merged	eligible
/code/branches/spacegate/data/levels/presentationDM.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/presentationDM.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/presentationDM.oxw	merged	eligible
/code/branches/usability/data/levels/presentationDM.oxw	merged	eligible
/code/trunk/data/levels/presentationDM.oxw	merged	eligible
/code/branches/ai/data/levels/presentationDM.oxw	6592-7033
/code/branches/ai2/data/levels/presentationDM.oxw	8721-8880
/code/branches/bigships/data/levels/presentationDM.oxw	8137-8588
/code/branches/buildsystem/data/levels/presentationDM.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/presentationDM.oxw	2506-2658
/code/branches/buildsystem3/data/levels/presentationDM.oxw	2662-2708
/code/branches/ceguilua/data/levels/presentationDM.oxw	1802-1808
/code/branches/chat/data/levels/presentationDM.oxw	6527-6797
/code/branches/chat2/data/levels/presentationDM.oxw	6836-6910
/code/branches/console/data/levels/presentationDM.oxw	5941-6104
/code/branches/consolecommands2/data/levels/presentationDM.oxw	6451-7178
/code/branches/consolecommands3/data/levels/presentationDM.oxw	7178-7283
/code/branches/core3/data/levels/presentationDM.oxw	1572-1739
/code/branches/core4/data/levels/presentationDM.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/presentationDM.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/presentationDM.oxw	7537-7686
/code/branches/doc/data/levels/presentationDM.oxw	7290-7400
/code/branches/dockingsystem/data/levels/presentationDM.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/presentationDM.oxw	6584-7030
/code/branches/fps/data/levels/presentationDM.oxw	6591-7072
/code/branches/gameimmersion/data/levels/presentationDM.oxw	8102-8577
/code/branches/gamestate/data/levels/presentationDM.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/presentationDM.oxw	6594-6745
/code/branches/gametypes/data/levels/presentationDM.oxw	2826-3031
/code/branches/gcc43/data/levels/presentationDM.oxw	1580
/code/branches/gui/data/levels/presentationDM.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/presentationDM.oxw	6584-6941
/code/branches/hudimprovements/data/levels/presentationDM.oxw	7920-8672
/code/branches/ingamemenu/data/levels/presentationDM.oxw	6000-6023
/code/branches/input/data/levels/presentationDM.oxw	1629-1636
/code/branches/ipv6/data/levels/presentationDM.oxw	7293-7458
/code/branches/kicklib/data/levels/presentationDM.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/presentationDM.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/presentationDM.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/presentationDM.oxw	7903-8175
/code/branches/libraries/data/levels/presentationDM.oxw	5612-5692
/code/branches/libraries2/data/levels/presentationDM.oxw	5703-5737
/code/branches/lod/data/levels/presentationDM.oxw	6586-6911
/code/branches/lodfinal/data/levels/presentationDM.oxw	2372-2411
/code/branches/mac_osx/data/levels/presentationDM.oxw	7789-8128,8135
/code/branches/map/data/levels/presentationDM.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/presentationDM.oxw	7502-7738
/code/branches/menu/data/levels/presentationDM.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/presentationDM.oxw	2754-2824
/code/branches/netp2/data/levels/presentationDM.oxw	2835-2988
/code/branches/netp3/data/levels/presentationDM.oxw	2988-3082
/code/branches/netp6/data/levels/presentationDM.oxw	3214-3302
/code/branches/network/data/levels/presentationDM.oxw	2356
/code/branches/network2/data/levels/presentationDM.oxw	6434-6465
/code/branches/network3/data/levels/presentationDM.oxw	7196-7344
/code/branches/network4/data/levels/presentationDM.oxw	7497-7755
/code/branches/network5/data/levels/presentationDM.oxw	7757-7781
/code/branches/network6/data/levels/presentationDM.oxw	7823-8315
/code/branches/network64/data/levels/presentationDM.oxw	2210-2355
/code/branches/notifications/data/levels/presentationDM.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/presentationDM.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/presentationDM.oxw	2171-2479
/code/branches/ois_update/data/levels/presentationDM.oxw	7506-7788
/code/branches/overlay/data/levels/presentationDM.oxw	2117-2385
/code/branches/particles/data/levels/presentationDM.oxw	2829-3085
/code/branches/particles2/data/levels/presentationDM.oxw	6050-6106,6109
/code/branches/pch/data/levels/presentationDM.oxw	3113-3194
/code/branches/physics/data/levels/presentationDM.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/presentationDM.oxw	2436-2457
/code/branches/pickup/data/levels/presentationDM.oxw	8145-8555
/code/branches/pickup2/data/levels/presentationDM.oxw	5942-6405
/code/branches/pickup3/data/levels/presentationDM.oxw	6418-6523
/code/branches/pickup4/data/levels/presentationDM.oxw	6594-6710
/code/branches/pickups/data/levels/presentationDM.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/presentationDM.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/presentationDM.oxw	7262-7263
/code/branches/portals/data/levels/presentationDM.oxw	8087-8455
/code/branches/portals2/data/levels/presentationDM.oxw	8460-8602
/code/branches/ppspickups1/data/levels/presentationDM.oxw	6552-6708
/code/branches/ppspickups2/data/levels/presentationDM.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/presentationDM.oxw	6757-6997
/code/branches/ppspickups4/data/levels/presentationDM.oxw	7003-7089
/code/branches/presentation2/data/levels/presentationDM.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/presentationDM.oxw	6913-7162
/code/branches/questsystem/data/levels/presentationDM.oxw	1894-2088
/code/branches/questsystem2/data/levels/presentationDM.oxw	2107-2259
/code/branches/questsystem5/data/levels/presentationDM.oxw	2776-2905
/code/branches/releasetodo/data/levels/presentationDM.oxw	7614-7647
/code/branches/resource/data/levels/presentationDM.oxw	3327-3366
/code/branches/resource2/data/levels/presentationDM.oxw	3372-5694
/code/branches/rocket/data/levels/presentationDM.oxw	6523-6950
/code/branches/rocket2/data/levels/presentationDM.oxw	6953-6970
/code/branches/script_trigger/data/levels/presentationDM.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/presentationDM.oxw	6559-6989
/code/branches/sound/data/levels/presentationDM.oxw	2829-3010
/code/branches/sound3/data/levels/presentationDM.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/presentationDM.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/presentationDM.oxw	8460-8613
/code/branches/spacerace/data/levels/presentationDM.oxw	8182-8630
/code/branches/steering/data/levels/presentationDM.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/presentationDM.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/presentationDM.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/presentationDM.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/presentationDM.oxw	8453-8636
/code/branches/unity_build/data/levels/presentationDM.oxw	8440-8716
/code/branches/weapon/data/levels/presentationDM.oxw	1925-2094
/code/branches/weapon2/data/levels/presentationDM.oxw	2107-2488
/code/branches/weapons/data/levels/presentationDM.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/presentationDM.oxw	2742-2890

code/branches/presentation2012/data/levels/presentationFS10.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/environment3/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/formation/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/gamecontent/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/hud/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/menue/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/output/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/pickup2012/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/presentation/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/presentation2011/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/shipSelection/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/sound2012/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/spacegate/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/usability/data/levels/presentationFS10.oxw	merged	eligible
/code/trunk/data/levels/presentationFS10.oxw	merged	eligible
/code/branches/ai/data/levels/presentationFS10.oxw	6592-7033
/code/branches/ai2/data/levels/presentationFS10.oxw	8721-8880
/code/branches/bigships/data/levels/presentationFS10.oxw	8137-8588
/code/branches/buildsystem/data/levels/presentationFS10.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/presentationFS10.oxw	2506-2658
/code/branches/buildsystem3/data/levels/presentationFS10.oxw	2662-2708
/code/branches/ceguilua/data/levels/presentationFS10.oxw	1802-1808
/code/branches/chat/data/levels/presentationFS10.oxw	6527-6797
/code/branches/chat2/data/levels/presentationFS10.oxw	6836-6910
/code/branches/console/data/levels/presentationFS10.oxw	5941-6104
/code/branches/consolecommands2/data/levels/presentationFS10.oxw	6451-7178
/code/branches/consolecommands3/data/levels/presentationFS10.oxw	7178-7283
/code/branches/core3/data/levels/presentationFS10.oxw	1572-1739
/code/branches/core4/data/levels/presentationFS10.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/presentationFS10.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/presentationFS10.oxw	7537-7686
/code/branches/doc/data/levels/presentationFS10.oxw	7290-7400
/code/branches/dockingsystem/data/levels/presentationFS10.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/presentationFS10.oxw	6584-7030
/code/branches/fps/data/levels/presentationFS10.oxw	6591-7072
/code/branches/gameimmersion/data/levels/presentationFS10.oxw	8102-8577
/code/branches/gamestate/data/levels/presentationFS10.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/presentationFS10.oxw	6594-6745
/code/branches/gametypes/data/levels/presentationFS10.oxw	2826-3031
/code/branches/gcc43/data/levels/presentationFS10.oxw	1580
/code/branches/gui/data/levels/presentationFS10.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/presentationFS10.oxw	6584-6941
/code/branches/hudimprovements/data/levels/presentationFS10.oxw	7920-8672
/code/branches/ingamemenu/data/levels/presentationFS10.oxw	6000-6023
/code/branches/input/data/levels/presentationFS10.oxw	1629-1636
/code/branches/ipv6/data/levels/presentationFS10.oxw	7293-7458
/code/branches/kicklib/data/levels/presentationFS10.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/presentationFS10.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/presentationFS10.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/presentationFS10.oxw	7903-8175
/code/branches/libraries/data/levels/presentationFS10.oxw	5612-5692
/code/branches/libraries2/data/levels/presentationFS10.oxw	5703-5737
/code/branches/lod/data/levels/presentationFS10.oxw	6586-6911
/code/branches/lodfinal/data/levels/presentationFS10.oxw	2372-2411
/code/branches/mac_osx/data/levels/presentationFS10.oxw	7789-8128,8135
/code/branches/map/data/levels/presentationFS10.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/presentationFS10.oxw	7502-7738
/code/branches/menu/data/levels/presentationFS10.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/presentationFS10.oxw	2754-2824
/code/branches/netp2/data/levels/presentationFS10.oxw	2835-2988
/code/branches/netp3/data/levels/presentationFS10.oxw	2988-3082
/code/branches/netp6/data/levels/presentationFS10.oxw	3214-3302
/code/branches/network/data/levels/presentationFS10.oxw	2356
/code/branches/network2/data/levels/presentationFS10.oxw	6434-6465
/code/branches/network3/data/levels/presentationFS10.oxw	7196-7344
/code/branches/network4/data/levels/presentationFS10.oxw	7497-7755
/code/branches/network5/data/levels/presentationFS10.oxw	7757-7781
/code/branches/network6/data/levels/presentationFS10.oxw	7823-8315
/code/branches/network64/data/levels/presentationFS10.oxw	2210-2355
/code/branches/notifications/data/levels/presentationFS10.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/presentationFS10.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/presentationFS10.oxw	2171-2479
/code/branches/ois_update/data/levels/presentationFS10.oxw	7506-7788
/code/branches/overlay/data/levels/presentationFS10.oxw	2117-2385
/code/branches/particles/data/levels/presentationFS10.oxw	2829-3085
/code/branches/particles2/data/levels/presentationFS10.oxw	6050-6106,6109
/code/branches/pch/data/levels/presentationFS10.oxw	3113-3194
/code/branches/physics/data/levels/presentationFS10.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/presentationFS10.oxw	2436-2457
/code/branches/pickup/data/levels/presentationFS10.oxw	8145-8555
/code/branches/pickup2/data/levels/presentationFS10.oxw	5942-6405
/code/branches/pickup3/data/levels/presentationFS10.oxw	6418-6523
/code/branches/pickup4/data/levels/presentationFS10.oxw	6594-6710
/code/branches/pickups/data/levels/presentationFS10.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/presentationFS10.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/presentationFS10.oxw	7262-7263
/code/branches/portals/data/levels/presentationFS10.oxw	8087-8455
/code/branches/portals2/data/levels/presentationFS10.oxw	8460-8602
/code/branches/ppspickups1/data/levels/presentationFS10.oxw	6552-6708
/code/branches/ppspickups2/data/levels/presentationFS10.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/presentationFS10.oxw	6757-6997
/code/branches/ppspickups4/data/levels/presentationFS10.oxw	7003-7089
/code/branches/presentation2/data/levels/presentationFS10.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/presentationFS10.oxw	6913-7162
/code/branches/questsystem/data/levels/presentationFS10.oxw	1894-2088
/code/branches/questsystem2/data/levels/presentationFS10.oxw	2107-2259
/code/branches/questsystem5/data/levels/presentationFS10.oxw	2776-2905
/code/branches/releasetodo/data/levels/presentationFS10.oxw	7614-7647
/code/branches/resource/data/levels/presentationFS10.oxw	3327-3366
/code/branches/resource2/data/levels/presentationFS10.oxw	3372-5694
/code/branches/rocket/data/levels/presentationFS10.oxw	6523-6950
/code/branches/rocket2/data/levels/presentationFS10.oxw	6953-6970
/code/branches/script_trigger/data/levels/presentationFS10.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/presentationFS10.oxw	6559-6989
/code/branches/sound/data/levels/presentationFS10.oxw	2829-3010
/code/branches/sound3/data/levels/presentationFS10.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/presentationFS10.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/presentationFS10.oxw	8460-8613
/code/branches/spacerace/data/levels/presentationFS10.oxw	8182-8630
/code/branches/steering/data/levels/presentationFS10.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/presentationFS10.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/presentationFS10.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/presentationFS10.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/presentationFS10.oxw	8453-8636
/code/branches/unity_build/data/levels/presentationFS10.oxw	8440-8716
/code/branches/weapon/data/levels/presentationFS10.oxw	1925-2094
/code/branches/weapon2/data/levels/presentationFS10.oxw	2107-2488
/code/branches/weapons/data/levels/presentationFS10.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/presentationFS10.oxw	2742-2890

code/branches/presentation2012/data/levels/presentationFS102.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/environment3/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/formation/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/gamecontent/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/hud/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/menue/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/output/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/pickup2012/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/presentation/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/presentation2011/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/shipSelection/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/sound2012/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/spacegate/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/usability/data/levels/presentationFS102.oxw	merged	eligible
/code/trunk/data/levels/presentationFS102.oxw	merged	eligible
/code/branches/ai/data/levels/presentationFS102.oxw	6592-7033
/code/branches/ai2/data/levels/presentationFS102.oxw	8721-8880
/code/branches/bigships/data/levels/presentationFS102.oxw	8137-8588
/code/branches/buildsystem/data/levels/presentationFS102.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/presentationFS102.oxw	2506-2658
/code/branches/buildsystem3/data/levels/presentationFS102.oxw	2662-2708
/code/branches/ceguilua/data/levels/presentationFS102.oxw	1802-1808
/code/branches/chat/data/levels/presentationFS102.oxw	6527-6797
/code/branches/chat2/data/levels/presentationFS102.oxw	6836-6910
/code/branches/console/data/levels/presentationFS102.oxw	5941-6104
/code/branches/consolecommands2/data/levels/presentationFS102.oxw	6451-7178
/code/branches/consolecommands3/data/levels/presentationFS102.oxw	7178-7283
/code/branches/core3/data/levels/presentationFS102.oxw	1572-1739
/code/branches/core4/data/levels/presentationFS102.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/presentationFS102.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/presentationFS102.oxw	7537-7686
/code/branches/doc/data/levels/presentationFS102.oxw	7290-7400
/code/branches/dockingsystem/data/levels/presentationFS102.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/presentationFS102.oxw	6584-7030
/code/branches/fps/data/levels/presentationFS102.oxw	6591-7072
/code/branches/gameimmersion/data/levels/presentationFS102.oxw	8102-8577
/code/branches/gamestate/data/levels/presentationFS102.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/presentationFS102.oxw	6594-6745
/code/branches/gametypes/data/levels/presentationFS102.oxw	2826-3031
/code/branches/gcc43/data/levels/presentationFS102.oxw	1580
/code/branches/gui/data/levels/presentationFS102.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/presentationFS102.oxw	6584-6941
/code/branches/hudimprovements/data/levels/presentationFS102.oxw	7920-8672
/code/branches/ingamemenu/data/levels/presentationFS102.oxw	6000-6023
/code/branches/input/data/levels/presentationFS102.oxw	1629-1636
/code/branches/ipv6/data/levels/presentationFS102.oxw	7293-7458
/code/branches/kicklib/data/levels/presentationFS102.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/presentationFS102.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/presentationFS102.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/presentationFS102.oxw	7903-8175
/code/branches/libraries/data/levels/presentationFS102.oxw	5612-5692
/code/branches/libraries2/data/levels/presentationFS102.oxw	5703-5737
/code/branches/lod/data/levels/presentationFS102.oxw	6586-6911
/code/branches/lodfinal/data/levels/presentationFS102.oxw	2372-2411
/code/branches/mac_osx/data/levels/presentationFS102.oxw	7789-8128,8135
/code/branches/map/data/levels/presentationFS102.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/presentationFS102.oxw	7502-7738
/code/branches/menu/data/levels/presentationFS102.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/presentationFS102.oxw	2754-2824
/code/branches/netp2/data/levels/presentationFS102.oxw	2835-2988
/code/branches/netp3/data/levels/presentationFS102.oxw	2988-3082
/code/branches/netp6/data/levels/presentationFS102.oxw	3214-3302
/code/branches/network/data/levels/presentationFS102.oxw	2356
/code/branches/network2/data/levels/presentationFS102.oxw	6434-6465
/code/branches/network3/data/levels/presentationFS102.oxw	7196-7344
/code/branches/network4/data/levels/presentationFS102.oxw	7497-7755
/code/branches/network5/data/levels/presentationFS102.oxw	7757-7781
/code/branches/network6/data/levels/presentationFS102.oxw	7823-8315
/code/branches/network64/data/levels/presentationFS102.oxw	2210-2355
/code/branches/notifications/data/levels/presentationFS102.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/presentationFS102.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/presentationFS102.oxw	2171-2479
/code/branches/ois_update/data/levels/presentationFS102.oxw	7506-7788
/code/branches/overlay/data/levels/presentationFS102.oxw	2117-2385
/code/branches/particles/data/levels/presentationFS102.oxw	2829-3085
/code/branches/particles2/data/levels/presentationFS102.oxw	6050-6106,6109
/code/branches/pch/data/levels/presentationFS102.oxw	3113-3194
/code/branches/physics/data/levels/presentationFS102.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/presentationFS102.oxw	2436-2457
/code/branches/pickup/data/levels/presentationFS102.oxw	8145-8555
/code/branches/pickup2/data/levels/presentationFS102.oxw	5942-6405
/code/branches/pickup3/data/levels/presentationFS102.oxw	6418-6523
/code/branches/pickup4/data/levels/presentationFS102.oxw	6594-6710
/code/branches/pickups/data/levels/presentationFS102.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/presentationFS102.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/presentationFS102.oxw	7262-7263
/code/branches/portals/data/levels/presentationFS102.oxw	8087-8455
/code/branches/portals2/data/levels/presentationFS102.oxw	8460-8602
/code/branches/ppspickups1/data/levels/presentationFS102.oxw	6552-6708
/code/branches/ppspickups2/data/levels/presentationFS102.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/presentationFS102.oxw	6757-6997
/code/branches/ppspickups4/data/levels/presentationFS102.oxw	7003-7089
/code/branches/presentation2/data/levels/presentationFS102.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/presentationFS102.oxw	6913-7162
/code/branches/questsystem/data/levels/presentationFS102.oxw	1894-2088
/code/branches/questsystem2/data/levels/presentationFS102.oxw	2107-2259
/code/branches/questsystem5/data/levels/presentationFS102.oxw	2776-2905
/code/branches/releasetodo/data/levels/presentationFS102.oxw	7614-7647
/code/branches/resource/data/levels/presentationFS102.oxw	3327-3366
/code/branches/resource2/data/levels/presentationFS102.oxw	3372-5694
/code/branches/rocket/data/levels/presentationFS102.oxw	6523-6950
/code/branches/rocket2/data/levels/presentationFS102.oxw	6953-6970
/code/branches/script_trigger/data/levels/presentationFS102.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/presentationFS102.oxw	6559-6989
/code/branches/sound/data/levels/presentationFS102.oxw	2829-3010
/code/branches/sound3/data/levels/presentationFS102.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/presentationFS102.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/presentationFS102.oxw	8460-8613
/code/branches/spacerace/data/levels/presentationFS102.oxw	8182-8630
/code/branches/steering/data/levels/presentationFS102.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/presentationFS102.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/presentationFS102.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/presentationFS102.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/presentationFS102.oxw	8453-8636
/code/branches/unity_build/data/levels/presentationFS102.oxw	8440-8716
/code/branches/weapon/data/levels/presentationFS102.oxw	1925-2094
/code/branches/weapon2/data/levels/presentationFS102.oxw	2107-2488
/code/branches/weapons/data/levels/presentationFS102.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/presentationFS102.oxw	2742-2890

code/branches/presentation2012/data/levels/presentationFS10Ed.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/environment3/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/formation/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/gamecontent/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/hud/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/menue/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/output/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/pickup2012/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/presentation/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/presentation2011/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/shipSelection/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/sound2012/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/spacegate/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/usability/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/trunk/data/levels/presentationFS10Ed.oxw	merged	eligible
/code/branches/ai/data/levels/presentationFS10Ed.oxw	6592-7033
/code/branches/ai2/data/levels/presentationFS10Ed.oxw	8721-8880
/code/branches/bigships/data/levels/presentationFS10Ed.oxw	8137-8588
/code/branches/buildsystem/data/levels/presentationFS10Ed.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/presentationFS10Ed.oxw	2506-2658
/code/branches/buildsystem3/data/levels/presentationFS10Ed.oxw	2662-2708
/code/branches/ceguilua/data/levels/presentationFS10Ed.oxw	1802-1808
/code/branches/chat/data/levels/presentationFS10Ed.oxw	6527-6797
/code/branches/chat2/data/levels/presentationFS10Ed.oxw	6836-6910
/code/branches/console/data/levels/presentationFS10Ed.oxw	5941-6104
/code/branches/consolecommands2/data/levels/presentationFS10Ed.oxw	6451-7178
/code/branches/consolecommands3/data/levels/presentationFS10Ed.oxw	7178-7283
/code/branches/core3/data/levels/presentationFS10Ed.oxw	1572-1739
/code/branches/core4/data/levels/presentationFS10Ed.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/presentationFS10Ed.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/presentationFS10Ed.oxw	7537-7686
/code/branches/doc/data/levels/presentationFS10Ed.oxw	7290-7400
/code/branches/dockingsystem/data/levels/presentationFS10Ed.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/presentationFS10Ed.oxw	6584-7030
/code/branches/fps/data/levels/presentationFS10Ed.oxw	6591-7072
/code/branches/gameimmersion/data/levels/presentationFS10Ed.oxw	8102-8577
/code/branches/gamestate/data/levels/presentationFS10Ed.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/presentationFS10Ed.oxw	6594-6745
/code/branches/gametypes/data/levels/presentationFS10Ed.oxw	2826-3031
/code/branches/gcc43/data/levels/presentationFS10Ed.oxw	1580
/code/branches/gui/data/levels/presentationFS10Ed.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/presentationFS10Ed.oxw	6584-6941
/code/branches/hudimprovements/data/levels/presentationFS10Ed.oxw	7920-8672
/code/branches/ingamemenu/data/levels/presentationFS10Ed.oxw	6000-6023
/code/branches/input/data/levels/presentationFS10Ed.oxw	1629-1636
/code/branches/ipv6/data/levels/presentationFS10Ed.oxw	7293-7458
/code/branches/kicklib/data/levels/presentationFS10Ed.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/presentationFS10Ed.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/presentationFS10Ed.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/presentationFS10Ed.oxw	7903-8175
/code/branches/libraries/data/levels/presentationFS10Ed.oxw	5612-5692
/code/branches/libraries2/data/levels/presentationFS10Ed.oxw	5703-5737
/code/branches/lod/data/levels/presentationFS10Ed.oxw	6586-6911
/code/branches/lodfinal/data/levels/presentationFS10Ed.oxw	2372-2411
/code/branches/mac_osx/data/levels/presentationFS10Ed.oxw	7789-8128,8135
/code/branches/map/data/levels/presentationFS10Ed.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/presentationFS10Ed.oxw	7502-7738
/code/branches/menu/data/levels/presentationFS10Ed.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/presentationFS10Ed.oxw	2754-2824
/code/branches/netp2/data/levels/presentationFS10Ed.oxw	2835-2988
/code/branches/netp3/data/levels/presentationFS10Ed.oxw	2988-3082
/code/branches/netp6/data/levels/presentationFS10Ed.oxw	3214-3302
/code/branches/network/data/levels/presentationFS10Ed.oxw	2356
/code/branches/network2/data/levels/presentationFS10Ed.oxw	6434-6465
/code/branches/network3/data/levels/presentationFS10Ed.oxw	7196-7344
/code/branches/network4/data/levels/presentationFS10Ed.oxw	7497-7755
/code/branches/network5/data/levels/presentationFS10Ed.oxw	7757-7781
/code/branches/network6/data/levels/presentationFS10Ed.oxw	7823-8315
/code/branches/network64/data/levels/presentationFS10Ed.oxw	2210-2355
/code/branches/notifications/data/levels/presentationFS10Ed.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/presentationFS10Ed.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/presentationFS10Ed.oxw	2171-2479
/code/branches/ois_update/data/levels/presentationFS10Ed.oxw	7506-7788
/code/branches/overlay/data/levels/presentationFS10Ed.oxw	2117-2385
/code/branches/particles/data/levels/presentationFS10Ed.oxw	2829-3085
/code/branches/particles2/data/levels/presentationFS10Ed.oxw	6050-6106,6109
/code/branches/pch/data/levels/presentationFS10Ed.oxw	3113-3194
/code/branches/physics/data/levels/presentationFS10Ed.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/presentationFS10Ed.oxw	2436-2457
/code/branches/pickup/data/levels/presentationFS10Ed.oxw	8145-8555
/code/branches/pickup2/data/levels/presentationFS10Ed.oxw	5942-6405
/code/branches/pickup3/data/levels/presentationFS10Ed.oxw	6418-6523
/code/branches/pickup4/data/levels/presentationFS10Ed.oxw	6594-6710
/code/branches/pickups/data/levels/presentationFS10Ed.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/presentationFS10Ed.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/presentationFS10Ed.oxw	7262-7263
/code/branches/portals/data/levels/presentationFS10Ed.oxw	8087-8455
/code/branches/portals2/data/levels/presentationFS10Ed.oxw	8460-8602
/code/branches/ppspickups1/data/levels/presentationFS10Ed.oxw	6552-6708
/code/branches/ppspickups2/data/levels/presentationFS10Ed.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/presentationFS10Ed.oxw	6757-6997
/code/branches/ppspickups4/data/levels/presentationFS10Ed.oxw	7003-7089
/code/branches/presentation2/data/levels/presentationFS10Ed.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/presentationFS10Ed.oxw	6913-7162
/code/branches/questsystem/data/levels/presentationFS10Ed.oxw	1894-2088
/code/branches/questsystem2/data/levels/presentationFS10Ed.oxw	2107-2259
/code/branches/questsystem5/data/levels/presentationFS10Ed.oxw	2776-2905
/code/branches/releasetodo/data/levels/presentationFS10Ed.oxw	7614-7647
/code/branches/resource/data/levels/presentationFS10Ed.oxw	3327-3366
/code/branches/resource2/data/levels/presentationFS10Ed.oxw	3372-5694
/code/branches/rocket/data/levels/presentationFS10Ed.oxw	6523-6950
/code/branches/rocket2/data/levels/presentationFS10Ed.oxw	6953-6970
/code/branches/script_trigger/data/levels/presentationFS10Ed.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/presentationFS10Ed.oxw	6559-6989
/code/branches/sound/data/levels/presentationFS10Ed.oxw	2829-3010
/code/branches/sound3/data/levels/presentationFS10Ed.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/presentationFS10Ed.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/presentationFS10Ed.oxw	8460-8613
/code/branches/spacerace/data/levels/presentationFS10Ed.oxw	8182-8630
/code/branches/steering/data/levels/presentationFS10Ed.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/presentationFS10Ed.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/presentationFS10Ed.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/presentationFS10Ed.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/presentationFS10Ed.oxw	8453-8636
/code/branches/unity_build/data/levels/presentationFS10Ed.oxw	8440-8716
/code/branches/weapon/data/levels/presentationFS10Ed.oxw	1925-2094
/code/branches/weapon2/data/levels/presentationFS10Ed.oxw	2107-2488
/code/branches/weapons/data/levels/presentationFS10Ed.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/presentationFS10Ed.oxw	2742-2890

code/branches/presentation2012/data/levels/presentationFS11.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/formation/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/gamecontent/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/hud/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/menue/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/output/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/pickup2012/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/presentation/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/presentation2011/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/shipSelection/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/sound2012/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/spacegate/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/presentationFS11.oxw	merged	eligible
/code/trunk/data/levels/presentationFS11.oxw	merged	eligible
/code/branches/ai/data/levels/presentationFS11.oxw	6592-7033
/code/branches/ai2/data/levels/presentationFS11.oxw	8721-8880
/code/branches/bigships/data/levels/presentationFS11.oxw	8137-8588
/code/branches/buildsystem/data/levels/presentationFS11.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/presentationFS11.oxw	2506-2658
/code/branches/buildsystem3/data/levels/presentationFS11.oxw	2662-2708
/code/branches/ceguilua/data/levels/presentationFS11.oxw	1802-1808
/code/branches/chat/data/levels/presentationFS11.oxw	6527-6797
/code/branches/chat2/data/levels/presentationFS11.oxw	6836-6910
/code/branches/console/data/levels/presentationFS11.oxw	5941-6104
/code/branches/consolecommands2/data/levels/presentationFS11.oxw	6451-7178
/code/branches/consolecommands3/data/levels/presentationFS11.oxw	7178-7283
/code/branches/core3/data/levels/presentationFS11.oxw	1572-1739
/code/branches/core4/data/levels/presentationFS11.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/presentationFS11.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/presentationFS11.oxw	7537-7686
/code/branches/doc/data/levels/presentationFS11.oxw	7290-7400
/code/branches/dockingsystem/data/levels/presentationFS11.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/presentationFS11.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/presentationFS11.oxw	6584-7030
/code/branches/fps/data/levels/presentationFS11.oxw	6591-7072
/code/branches/gameimmersion/data/levels/presentationFS11.oxw	8102-8577
/code/branches/gamestate/data/levels/presentationFS11.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/presentationFS11.oxw	6594-6745
/code/branches/gametypes/data/levels/presentationFS11.oxw	2826-3031
/code/branches/gcc43/data/levels/presentationFS11.oxw	1580
/code/branches/gui/data/levels/presentationFS11.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/presentationFS11.oxw	6584-6941
/code/branches/hudimprovements/data/levels/presentationFS11.oxw	7920-8672
/code/branches/ingamemenu/data/levels/presentationFS11.oxw	6000-6023
/code/branches/input/data/levels/presentationFS11.oxw	1629-1636
/code/branches/ipv6/data/levels/presentationFS11.oxw	7293-7458
/code/branches/kicklib/data/levels/presentationFS11.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/presentationFS11.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/presentationFS11.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/presentationFS11.oxw	7903-8175
/code/branches/libraries/data/levels/presentationFS11.oxw	5612-5692
/code/branches/libraries2/data/levels/presentationFS11.oxw	5703-5737
/code/branches/lod/data/levels/presentationFS11.oxw	6586-6911
/code/branches/lodfinal/data/levels/presentationFS11.oxw	2372-2411
/code/branches/mac_osx/data/levels/presentationFS11.oxw	7789-8128,8135
/code/branches/map/data/levels/presentationFS11.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/presentationFS11.oxw	7502-7738
/code/branches/menu/data/levels/presentationFS11.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/presentationFS11.oxw	2754-2824
/code/branches/netp2/data/levels/presentationFS11.oxw	2835-2988
/code/branches/netp3/data/levels/presentationFS11.oxw	2988-3082
/code/branches/netp6/data/levels/presentationFS11.oxw	3214-3302
/code/branches/network/data/levels/presentationFS11.oxw	2356
/code/branches/network2/data/levels/presentationFS11.oxw	6434-6465
/code/branches/network3/data/levels/presentationFS11.oxw	7196-7344
/code/branches/network4/data/levels/presentationFS11.oxw	7497-7755
/code/branches/network5/data/levels/presentationFS11.oxw	7757-7781
/code/branches/network6/data/levels/presentationFS11.oxw	7823-8315
/code/branches/network64/data/levels/presentationFS11.oxw	2210-2355
/code/branches/notifications/data/levels/presentationFS11.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/presentationFS11.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/presentationFS11.oxw	2171-2479
/code/branches/ois_update/data/levels/presentationFS11.oxw	7506-7788
/code/branches/overlay/data/levels/presentationFS11.oxw	2117-2385
/code/branches/particles/data/levels/presentationFS11.oxw	2829-3085
/code/branches/particles2/data/levels/presentationFS11.oxw	6050-6106,6109
/code/branches/pch/data/levels/presentationFS11.oxw	3113-3194
/code/branches/physics/data/levels/presentationFS11.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/presentationFS11.oxw	2436-2457
/code/branches/pickup/data/levels/presentationFS11.oxw	8145-8555
/code/branches/pickup2/data/levels/presentationFS11.oxw	5942-6405
/code/branches/pickup3/data/levels/presentationFS11.oxw	6418-6523
/code/branches/pickup4/data/levels/presentationFS11.oxw	6594-6710
/code/branches/pickups/data/levels/presentationFS11.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/presentationFS11.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/presentationFS11.oxw	7262-7263
/code/branches/portals/data/levels/presentationFS11.oxw	8087-8455
/code/branches/portals2/data/levels/presentationFS11.oxw	8460-8602
/code/branches/ppspickups1/data/levels/presentationFS11.oxw	6552-6708
/code/branches/ppspickups2/data/levels/presentationFS11.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/presentationFS11.oxw	6757-6997
/code/branches/ppspickups4/data/levels/presentationFS11.oxw	7003-7089
/code/branches/presentation2/data/levels/presentationFS11.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/presentationFS11.oxw	6913-7162
/code/branches/questsystem/data/levels/presentationFS11.oxw	1894-2088
/code/branches/questsystem2/data/levels/presentationFS11.oxw	2107-2259
/code/branches/questsystem5/data/levels/presentationFS11.oxw	2776-2905
/code/branches/releasetodo/data/levels/presentationFS11.oxw	7614-7647
/code/branches/resource/data/levels/presentationFS11.oxw	3327-3366
/code/branches/resource2/data/levels/presentationFS11.oxw	3372-5694
/code/branches/rocket/data/levels/presentationFS11.oxw	6523-6950
/code/branches/rocket2/data/levels/presentationFS11.oxw	6953-6970
/code/branches/script_trigger/data/levels/presentationFS11.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/presentationFS11.oxw	6559-6989
/code/branches/sound/data/levels/presentationFS11.oxw	2829-3010
/code/branches/sound3/data/levels/presentationFS11.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/presentationFS11.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/presentationFS11.oxw	8460-8613
/code/branches/spacerace/data/levels/presentationFS11.oxw	8182-8630
/code/branches/steering/data/levels/presentationFS11.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/presentationFS11.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/presentationFS11.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/presentationFS11.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/presentationFS11.oxw	8453-8636
/code/branches/unity_build/data/levels/presentationFS11.oxw	8440-8716
/code/branches/usability/data/levels/presentationFS11.oxw	7915-8078
/code/branches/weapon/data/levels/presentationFS11.oxw	1925-2094
/code/branches/weapon2/data/levels/presentationFS11.oxw	2107-2488
/code/branches/weapons/data/levels/presentationFS11.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/presentationFS11.oxw	2742-2890

code/branches/presentation2012/data/levels/presentationHS09.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/environment3/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/formation/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/gamecontent/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/hud/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/menue/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/output/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/pickup2012/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/presentation/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/presentation2011/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/shipSelection/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/sound2012/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/spacegate/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/usability/data/levels/presentationHS09.oxw	merged	eligible
/code/trunk/data/levels/presentationHS09.oxw	merged	eligible
/code/branches/ai/data/levels/presentationHS09.oxw	6592-7033
/code/branches/ai2/data/levels/presentationHS09.oxw	8721-8880
/code/branches/bigships/data/levels/presentationHS09.oxw	8137-8588
/code/branches/buildsystem/data/levels/presentationHS09.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/presentationHS09.oxw	2506-2658
/code/branches/buildsystem3/data/levels/presentationHS09.oxw	2662-2708
/code/branches/ceguilua/data/levels/presentationHS09.oxw	1802-1808
/code/branches/chat/data/levels/presentationHS09.oxw	6527-6797
/code/branches/chat2/data/levels/presentationHS09.oxw	6836-6910
/code/branches/console/data/levels/presentationHS09.oxw	5941-6104
/code/branches/consolecommands2/data/levels/presentationHS09.oxw	6451-7178
/code/branches/consolecommands3/data/levels/presentationHS09.oxw	7178-7283
/code/branches/core3/data/levels/presentationHS09.oxw	1572-1739
/code/branches/core4/data/levels/presentationHS09.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/presentationHS09.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/presentationHS09.oxw	7537-7686
/code/branches/doc/data/levels/presentationHS09.oxw	7290-7400
/code/branches/dockingsystem/data/levels/presentationHS09.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/presentationHS09.oxw	6584-7030
/code/branches/fps/data/levels/presentationHS09.oxw	6591-7072
/code/branches/gameimmersion/data/levels/presentationHS09.oxw	8102-8577
/code/branches/gamestate/data/levels/presentationHS09.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/presentationHS09.oxw	6594-6745
/code/branches/gametypes/data/levels/presentationHS09.oxw	2826-3031
/code/branches/gcc43/data/levels/presentationHS09.oxw	1580
/code/branches/gui/data/levels/presentationHS09.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/presentationHS09.oxw	6584-6941
/code/branches/hudimprovements/data/levels/presentationHS09.oxw	7920-8672
/code/branches/ingamemenu/data/levels/presentationHS09.oxw	6000-6023
/code/branches/input/data/levels/presentationHS09.oxw	1629-1636
/code/branches/ipv6/data/levels/presentationHS09.oxw	7293-7458
/code/branches/kicklib/data/levels/presentationHS09.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/presentationHS09.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/presentationHS09.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/presentationHS09.oxw	7903-8175
/code/branches/libraries/data/levels/presentationHS09.oxw	5612-5692
/code/branches/libraries2/data/levels/presentationHS09.oxw	5703-5737
/code/branches/lod/data/levels/presentationHS09.oxw	6586-6911
/code/branches/lodfinal/data/levels/presentationHS09.oxw	2372-2411
/code/branches/mac_osx/data/levels/presentationHS09.oxw	7789-8128,8135
/code/branches/map/data/levels/presentationHS09.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/presentationHS09.oxw	7502-7738
/code/branches/menu/data/levels/presentationHS09.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/presentationHS09.oxw	2754-2824
/code/branches/netp2/data/levels/presentationHS09.oxw	2835-2988
/code/branches/netp3/data/levels/presentationHS09.oxw	2988-3082
/code/branches/netp6/data/levels/presentationHS09.oxw	3214-3302
/code/branches/network/data/levels/presentationHS09.oxw	2356
/code/branches/network2/data/levels/presentationHS09.oxw	6434-6465
/code/branches/network3/data/levels/presentationHS09.oxw	7196-7344
/code/branches/network4/data/levels/presentationHS09.oxw	7497-7755
/code/branches/network5/data/levels/presentationHS09.oxw	7757-7781
/code/branches/network6/data/levels/presentationHS09.oxw	7823-8315
/code/branches/network64/data/levels/presentationHS09.oxw	2210-2355
/code/branches/notifications/data/levels/presentationHS09.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/presentationHS09.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/presentationHS09.oxw	2171-2479
/code/branches/ois_update/data/levels/presentationHS09.oxw	7506-7788
/code/branches/overlay/data/levels/presentationHS09.oxw	2117-2385
/code/branches/particles/data/levels/presentationHS09.oxw	2829-3085
/code/branches/particles2/data/levels/presentationHS09.oxw	6050-6106,6109
/code/branches/pch/data/levels/presentationHS09.oxw	3113-3194
/code/branches/physics/data/levels/presentationHS09.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/presentationHS09.oxw	2436-2457
/code/branches/pickup/data/levels/presentationHS09.oxw	8145-8555
/code/branches/pickup2/data/levels/presentationHS09.oxw	5942-6405
/code/branches/pickup3/data/levels/presentationHS09.oxw	6418-6523
/code/branches/pickup4/data/levels/presentationHS09.oxw	6594-6710
/code/branches/pickups/data/levels/presentationHS09.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/presentationHS09.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/presentationHS09.oxw	7262-7263
/code/branches/portals/data/levels/presentationHS09.oxw	8087-8455
/code/branches/portals2/data/levels/presentationHS09.oxw	8460-8602
/code/branches/ppspickups1/data/levels/presentationHS09.oxw	6552-6708
/code/branches/ppspickups2/data/levels/presentationHS09.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/presentationHS09.oxw	6757-6997
/code/branches/ppspickups4/data/levels/presentationHS09.oxw	7003-7089
/code/branches/presentation2/data/levels/presentationHS09.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/presentationHS09.oxw	6913-7162
/code/branches/questsystem/data/levels/presentationHS09.oxw	1894-2088
/code/branches/questsystem2/data/levels/presentationHS09.oxw	2107-2259
/code/branches/questsystem5/data/levels/presentationHS09.oxw	2776-2905
/code/branches/releasetodo/data/levels/presentationHS09.oxw	7614-7647
/code/branches/resource/data/levels/presentationHS09.oxw	3327-3366
/code/branches/resource2/data/levels/presentationHS09.oxw	3372-5694
/code/branches/rocket/data/levels/presentationHS09.oxw	6523-6950
/code/branches/rocket2/data/levels/presentationHS09.oxw	6953-6970
/code/branches/script_trigger/data/levels/presentationHS09.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/presentationHS09.oxw	6559-6989
/code/branches/sound/data/levels/presentationHS09.oxw	2829-3010
/code/branches/sound3/data/levels/presentationHS09.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/presentationHS09.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/presentationHS09.oxw	8460-8613
/code/branches/spacerace/data/levels/presentationHS09.oxw	8182-8630
/code/branches/steering/data/levels/presentationHS09.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/presentationHS09.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/presentationHS09.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/presentationHS09.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/presentationHS09.oxw	8453-8636
/code/branches/unity_build/data/levels/presentationHS09.oxw	8440-8716
/code/branches/weapon/data/levels/presentationHS09.oxw	1925-2094
/code/branches/weapon2/data/levels/presentationHS09.oxw	2107-2488
/code/branches/weapons/data/levels/presentationHS09.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/presentationHS09.oxw	2742-2890

code/branches/presentation2012/data/levels/presentationHS09b.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/environment3/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/formation/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/gamecontent/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/hud/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/menue/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/output/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/pickup2012/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/presentation/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/presentation2011/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/shipSelection/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/sound2012/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/spacegate/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/usability/data/levels/presentationHS09b.oxw	merged	eligible
/code/trunk/data/levels/presentationHS09b.oxw	merged	eligible
/code/branches/ai/data/levels/presentationHS09b.oxw	6592-7033
/code/branches/ai2/data/levels/presentationHS09b.oxw	8721-8880
/code/branches/bigships/data/levels/presentationHS09b.oxw	8137-8588
/code/branches/buildsystem/data/levels/presentationHS09b.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/presentationHS09b.oxw	2506-2658
/code/branches/buildsystem3/data/levels/presentationHS09b.oxw	2662-2708
/code/branches/ceguilua/data/levels/presentationHS09b.oxw	1802-1808
/code/branches/chat/data/levels/presentationHS09b.oxw	6527-6797
/code/branches/chat2/data/levels/presentationHS09b.oxw	6836-6910
/code/branches/console/data/levels/presentationHS09b.oxw	5941-6104
/code/branches/consolecommands2/data/levels/presentationHS09b.oxw	6451-7178
/code/branches/consolecommands3/data/levels/presentationHS09b.oxw	7178-7283
/code/branches/core3/data/levels/presentationHS09b.oxw	1572-1739
/code/branches/core4/data/levels/presentationHS09b.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/presentationHS09b.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/presentationHS09b.oxw	7537-7686
/code/branches/doc/data/levels/presentationHS09b.oxw	7290-7400
/code/branches/dockingsystem/data/levels/presentationHS09b.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/presentationHS09b.oxw	6584-7030
/code/branches/fps/data/levels/presentationHS09b.oxw	6591-7072
/code/branches/gameimmersion/data/levels/presentationHS09b.oxw	8102-8577
/code/branches/gamestate/data/levels/presentationHS09b.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/presentationHS09b.oxw	6594-6745
/code/branches/gametypes/data/levels/presentationHS09b.oxw	2826-3031
/code/branches/gcc43/data/levels/presentationHS09b.oxw	1580
/code/branches/gui/data/levels/presentationHS09b.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/presentationHS09b.oxw	6584-6941
/code/branches/hudimprovements/data/levels/presentationHS09b.oxw	7920-8672
/code/branches/ingamemenu/data/levels/presentationHS09b.oxw	6000-6023
/code/branches/input/data/levels/presentationHS09b.oxw	1629-1636
/code/branches/ipv6/data/levels/presentationHS09b.oxw	7293-7458
/code/branches/kicklib/data/levels/presentationHS09b.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/presentationHS09b.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/presentationHS09b.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/presentationHS09b.oxw	7903-8175
/code/branches/libraries/data/levels/presentationHS09b.oxw	5612-5692
/code/branches/libraries2/data/levels/presentationHS09b.oxw	5703-5737
/code/branches/lod/data/levels/presentationHS09b.oxw	6586-6911
/code/branches/lodfinal/data/levels/presentationHS09b.oxw	2372-2411
/code/branches/mac_osx/data/levels/presentationHS09b.oxw	7789-8128,8135
/code/branches/map/data/levels/presentationHS09b.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/presentationHS09b.oxw	7502-7738
/code/branches/menu/data/levels/presentationHS09b.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/presentationHS09b.oxw	2754-2824
/code/branches/netp2/data/levels/presentationHS09b.oxw	2835-2988
/code/branches/netp3/data/levels/presentationHS09b.oxw	2988-3082
/code/branches/netp6/data/levels/presentationHS09b.oxw	3214-3302
/code/branches/network/data/levels/presentationHS09b.oxw	2356
/code/branches/network2/data/levels/presentationHS09b.oxw	6434-6465
/code/branches/network3/data/levels/presentationHS09b.oxw	7196-7344
/code/branches/network4/data/levels/presentationHS09b.oxw	7497-7755
/code/branches/network5/data/levels/presentationHS09b.oxw	7757-7781
/code/branches/network6/data/levels/presentationHS09b.oxw	7823-8315
/code/branches/network64/data/levels/presentationHS09b.oxw	2210-2355
/code/branches/notifications/data/levels/presentationHS09b.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/presentationHS09b.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/presentationHS09b.oxw	2171-2479
/code/branches/ois_update/data/levels/presentationHS09b.oxw	7506-7788
/code/branches/overlay/data/levels/presentationHS09b.oxw	2117-2385
/code/branches/particles/data/levels/presentationHS09b.oxw	2829-3085
/code/branches/particles2/data/levels/presentationHS09b.oxw	6050-6106,6109
/code/branches/pch/data/levels/presentationHS09b.oxw	3113-3194
/code/branches/physics/data/levels/presentationHS09b.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/presentationHS09b.oxw	2436-2457
/code/branches/pickup/data/levels/presentationHS09b.oxw	8145-8555
/code/branches/pickup2/data/levels/presentationHS09b.oxw	5942-6405
/code/branches/pickup3/data/levels/presentationHS09b.oxw	6418-6523
/code/branches/pickup4/data/levels/presentationHS09b.oxw	6594-6710
/code/branches/pickups/data/levels/presentationHS09b.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/presentationHS09b.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/presentationHS09b.oxw	7262-7263
/code/branches/portals/data/levels/presentationHS09b.oxw	8087-8455
/code/branches/portals2/data/levels/presentationHS09b.oxw	8460-8602
/code/branches/ppspickups1/data/levels/presentationHS09b.oxw	6552-6708
/code/branches/ppspickups2/data/levels/presentationHS09b.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/presentationHS09b.oxw	6757-6997
/code/branches/ppspickups4/data/levels/presentationHS09b.oxw	7003-7089
/code/branches/presentation2/data/levels/presentationHS09b.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/presentationHS09b.oxw	6913-7162
/code/branches/questsystem/data/levels/presentationHS09b.oxw	1894-2088
/code/branches/questsystem2/data/levels/presentationHS09b.oxw	2107-2259
/code/branches/questsystem5/data/levels/presentationHS09b.oxw	2776-2905
/code/branches/releasetodo/data/levels/presentationHS09b.oxw	7614-7647
/code/branches/resource/data/levels/presentationHS09b.oxw	3327-3366
/code/branches/resource2/data/levels/presentationHS09b.oxw	3372-5694
/code/branches/rocket/data/levels/presentationHS09b.oxw	6523-6950
/code/branches/rocket2/data/levels/presentationHS09b.oxw	6953-6970
/code/branches/script_trigger/data/levels/presentationHS09b.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/presentationHS09b.oxw	6559-6989
/code/branches/sound/data/levels/presentationHS09b.oxw	2829-3010
/code/branches/sound3/data/levels/presentationHS09b.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/presentationHS09b.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/presentationHS09b.oxw	8460-8613
/code/branches/spacerace/data/levels/presentationHS09b.oxw	8182-8630
/code/branches/steering/data/levels/presentationHS09b.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/presentationHS09b.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/presentationHS09b.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/presentationHS09b.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/presentationHS09b.oxw	8453-8636
/code/branches/unity_build/data/levels/presentationHS09b.oxw	8440-8716
/code/branches/weapon/data/levels/presentationHS09b.oxw	1925-2094
/code/branches/weapon2/data/levels/presentationHS09b.oxw	2107-2488
/code/branches/weapons/data/levels/presentationHS09b.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/presentationHS09b.oxw	2742-2890

code/branches/presentation2012/data/levels/presentationHS11.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/newlevel2012/data/levels/presentationHS11.oxw	merged	eligible
/code/branches/pickup2012/data/levels/presentationHS11.oxw	merged	eligible
/code/branches/presentation2011/data/levels/presentationHS11.oxw	merged	eligible
/code/branches/shipSelection/data/levels/presentationHS11.oxw	merged	eligible
/code/branches/sound2012/data/levels/presentationHS11.oxw	merged	eligible
/code/branches/spacegate/data/levels/presentationHS11.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/presentationHS11.oxw	merged	eligible
/code/trunk/data/levels/presentationHS11.oxw	merged	eligible
/code/branches/ai/data/levels/presentationHS11.oxw	6592-7033
/code/branches/ai2/data/levels/presentationHS11.oxw	8721-8880
/code/branches/bigships/data/levels/presentationHS11.oxw	8137-8588
/code/branches/buildsystem/data/levels/presentationHS11.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/presentationHS11.oxw	2506-2658
/code/branches/buildsystem3/data/levels/presentationHS11.oxw	2662-2708
/code/branches/ceguilua/data/levels/presentationHS11.oxw	1802-1808
/code/branches/chat/data/levels/presentationHS11.oxw	6527-6797
/code/branches/chat2/data/levels/presentationHS11.oxw	6836-6910
/code/branches/console/data/levels/presentationHS11.oxw	5941-6104
/code/branches/consolecommands2/data/levels/presentationHS11.oxw	6451-7178
/code/branches/consolecommands3/data/levels/presentationHS11.oxw	7178-7283
/code/branches/core3/data/levels/presentationHS11.oxw	1572-1739
/code/branches/core4/data/levels/presentationHS11.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/presentationHS11.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/presentationHS11.oxw	7537-7686
/code/branches/doc/data/levels/presentationHS11.oxw	7290-7400
/code/branches/dockingsystem/data/levels/presentationHS11.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/presentationHS11.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/presentationHS11.oxw	6584-7030
/code/branches/environment3/data/levels/presentationHS11.oxw	8887-8975
/code/branches/formation/data/levels/presentationHS11.oxw	8885-8991
/code/branches/fps/data/levels/presentationHS11.oxw	6591-7072
/code/branches/gamecontent/data/levels/presentationHS11.oxw	8893-8968
/code/branches/gameimmersion/data/levels/presentationHS11.oxw	8102-8577
/code/branches/gamestate/data/levels/presentationHS11.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/presentationHS11.oxw	6594-6745
/code/branches/gametypes/data/levels/presentationHS11.oxw	2826-3031
/code/branches/gcc43/data/levels/presentationHS11.oxw	1580
/code/branches/gui/data/levels/presentationHS11.oxw	1635-1723,2795-2894
/code/branches/hud/data/levels/presentationHS11.oxw	8883-8986
/code/branches/hudelements/data/levels/presentationHS11.oxw	6584-6941
/code/branches/hudimprovements/data/levels/presentationHS11.oxw	7920-8672
/code/branches/ingamemenu/data/levels/presentationHS11.oxw	6000-6023
/code/branches/input/data/levels/presentationHS11.oxw	1629-1636
/code/branches/ipv6/data/levels/presentationHS11.oxw	7293-7458
/code/branches/kicklib/data/levels/presentationHS11.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/presentationHS11.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/presentationHS11.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/presentationHS11.oxw	7903-8175
/code/branches/libraries/data/levels/presentationHS11.oxw	5612-5692
/code/branches/libraries2/data/levels/presentationHS11.oxw	5703-5737
/code/branches/lod/data/levels/presentationHS11.oxw	6586-6911
/code/branches/lodfinal/data/levels/presentationHS11.oxw	2372-2411
/code/branches/mac_osx/data/levels/presentationHS11.oxw	7789-8128,8135
/code/branches/map/data/levels/presentationHS11.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/presentationHS11.oxw	7502-7738
/code/branches/masterserverfix/data/levels/presentationHS11.oxw	8933-8936
/code/branches/menu/data/levels/presentationHS11.oxw	5941-6146,6148,7536-7687
/code/branches/menue/data/levels/presentationHS11.oxw	8884-8976
/code/branches/miniprojects/data/levels/presentationHS11.oxw	2754-2824
/code/branches/netp2/data/levels/presentationHS11.oxw	2835-2988
/code/branches/netp3/data/levels/presentationHS11.oxw	2988-3082
/code/branches/netp6/data/levels/presentationHS11.oxw	3214-3302
/code/branches/network/data/levels/presentationHS11.oxw	2356
/code/branches/network2/data/levels/presentationHS11.oxw	6434-6465
/code/branches/network3/data/levels/presentationHS11.oxw	7196-7344
/code/branches/network4/data/levels/presentationHS11.oxw	7497-7755
/code/branches/network5/data/levels/presentationHS11.oxw	7757-7781
/code/branches/network6/data/levels/presentationHS11.oxw	7823-8315
/code/branches/network64/data/levels/presentationHS11.oxw	2210-2355
/code/branches/notifications/data/levels/presentationHS11.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/presentationHS11.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/presentationHS11.oxw	2171-2479
/code/branches/ois_update/data/levels/presentationHS11.oxw	7506-7788
/code/branches/output/data/levels/presentationHS11.oxw	8739-8857
/code/branches/overlay/data/levels/presentationHS11.oxw	2117-2385
/code/branches/particles/data/levels/presentationHS11.oxw	2829-3085
/code/branches/particles2/data/levels/presentationHS11.oxw	6050-6106,6109
/code/branches/pch/data/levels/presentationHS11.oxw	3113-3194
/code/branches/physics/data/levels/presentationHS11.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/presentationHS11.oxw	2436-2457
/code/branches/pickup/data/levels/presentationHS11.oxw	8145-8555
/code/branches/pickup2/data/levels/presentationHS11.oxw	5942-6405
/code/branches/pickup3/data/levels/presentationHS11.oxw	6418-6523
/code/branches/pickup4/data/levels/presentationHS11.oxw	6594-6710
/code/branches/pickups/data/levels/presentationHS11.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/presentationHS11.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/presentationHS11.oxw	7262-7263
/code/branches/portals/data/levels/presentationHS11.oxw	8087-8455
/code/branches/portals2/data/levels/presentationHS11.oxw	8460-8602
/code/branches/ppspickups1/data/levels/presentationHS11.oxw	6552-6708
/code/branches/ppspickups2/data/levels/presentationHS11.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/presentationHS11.oxw	6757-6997
/code/branches/ppspickups4/data/levels/presentationHS11.oxw	7003-7089
/code/branches/presentation/data/levels/presentationHS11.oxw	2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/presentationHS11.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/presentationHS11.oxw	6913-7162
/code/branches/questsystem/data/levels/presentationHS11.oxw	1894-2088
/code/branches/questsystem2/data/levels/presentationHS11.oxw	2107-2259
/code/branches/questsystem5/data/levels/presentationHS11.oxw	2776-2905
/code/branches/releasetodo/data/levels/presentationHS11.oxw	7614-7647
/code/branches/resource/data/levels/presentationHS11.oxw	3327-3366
/code/branches/resource2/data/levels/presentationHS11.oxw	3372-5694
/code/branches/rocket/data/levels/presentationHS11.oxw	6523-6950
/code/branches/rocket2/data/levels/presentationHS11.oxw	6953-6970
/code/branches/script_trigger/data/levels/presentationHS11.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/presentationHS11.oxw	6559-6989
/code/branches/sound/data/levels/presentationHS11.oxw	2829-3010
/code/branches/sound3/data/levels/presentationHS11.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/presentationHS11.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/presentationHS11.oxw	8460-8613
/code/branches/spacerace/data/levels/presentationHS11.oxw	8182-8630
/code/branches/spaceraceTwo/data/levels/presentationHS11.oxw	8881-8996
/code/branches/steering/data/levels/presentationHS11.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/presentationHS11.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/presentationHS11.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/presentationHS11.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/presentationHS11.oxw	8453-8636
/code/branches/unity_build/data/levels/presentationHS11.oxw	8440-8716
/code/branches/usability/data/levels/presentationHS11.oxw	7915-8078
/code/branches/weapon/data/levels/presentationHS11.oxw	1925-2094
/code/branches/weapon2/data/levels/presentationHS11.oxw	2107-2488
/code/branches/weapons/data/levels/presentationHS11.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/presentationHS11.oxw	2742-2890

code/branches/presentation2012/data/levels/princessAeryn.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/environment3/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/formation/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/gamecontent/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/hud/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/menue/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/output/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/pickup2012/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/presentation/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/presentation2011/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/shipSelection/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/sound2012/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/spacegate/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/usability/data/levels/princessAeryn.oxw	merged	eligible
/code/trunk/data/levels/princessAeryn.oxw	merged	eligible
/code/branches/ai/data/levels/princessAeryn.oxw	6592-7033
/code/branches/ai2/data/levels/princessAeryn.oxw	8721-8880
/code/branches/bigships/data/levels/princessAeryn.oxw	8137-8588
/code/branches/buildsystem/data/levels/princessAeryn.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/princessAeryn.oxw	2506-2658
/code/branches/buildsystem3/data/levels/princessAeryn.oxw	2662-2708
/code/branches/ceguilua/data/levels/princessAeryn.oxw	1802-1808
/code/branches/chat/data/levels/princessAeryn.oxw	6527-6797
/code/branches/chat2/data/levels/princessAeryn.oxw	6836-6910
/code/branches/console/data/levels/princessAeryn.oxw	5941-6104
/code/branches/consolecommands2/data/levels/princessAeryn.oxw	6451-7178
/code/branches/consolecommands3/data/levels/princessAeryn.oxw	7178-7283
/code/branches/core3/data/levels/princessAeryn.oxw	1572-1739
/code/branches/core4/data/levels/princessAeryn.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/princessAeryn.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/princessAeryn.oxw	7537-7686
/code/branches/doc/data/levels/princessAeryn.oxw	7290-7400
/code/branches/dockingsystem/data/levels/princessAeryn.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/princessAeryn.oxw	6584-7030
/code/branches/fps/data/levels/princessAeryn.oxw	6591-7072
/code/branches/gameimmersion/data/levels/princessAeryn.oxw	8102-8577
/code/branches/gamestate/data/levels/princessAeryn.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/princessAeryn.oxw	6594-6745
/code/branches/gametypes/data/levels/princessAeryn.oxw	2826-3031
/code/branches/gcc43/data/levels/princessAeryn.oxw	1580
/code/branches/gui/data/levels/princessAeryn.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/princessAeryn.oxw	6584-6941
/code/branches/hudimprovements/data/levels/princessAeryn.oxw	7920-8672
/code/branches/ingamemenu/data/levels/princessAeryn.oxw	6000-6023
/code/branches/input/data/levels/princessAeryn.oxw	1629-1636
/code/branches/ipv6/data/levels/princessAeryn.oxw	7293-7458
/code/branches/kicklib/data/levels/princessAeryn.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/princessAeryn.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/princessAeryn.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/princessAeryn.oxw	7903-8175
/code/branches/libraries/data/levels/princessAeryn.oxw	5612-5692
/code/branches/libraries2/data/levels/princessAeryn.oxw	5703-5737
/code/branches/lod/data/levels/princessAeryn.oxw	6586-6911
/code/branches/lodfinal/data/levels/princessAeryn.oxw	2372-2411
/code/branches/mac_osx/data/levels/princessAeryn.oxw	7789-8128,8135
/code/branches/map/data/levels/princessAeryn.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/princessAeryn.oxw	7502-7738
/code/branches/menu/data/levels/princessAeryn.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/princessAeryn.oxw	2754-2824
/code/branches/netp2/data/levels/princessAeryn.oxw	2835-2988
/code/branches/netp3/data/levels/princessAeryn.oxw	2988-3082
/code/branches/netp6/data/levels/princessAeryn.oxw	3214-3302
/code/branches/network/data/levels/princessAeryn.oxw	2356
/code/branches/network2/data/levels/princessAeryn.oxw	6434-6465
/code/branches/network3/data/levels/princessAeryn.oxw	7196-7344
/code/branches/network4/data/levels/princessAeryn.oxw	7497-7755
/code/branches/network5/data/levels/princessAeryn.oxw	7757-7781
/code/branches/network6/data/levels/princessAeryn.oxw	7823-8315
/code/branches/network64/data/levels/princessAeryn.oxw	2210-2355
/code/branches/notifications/data/levels/princessAeryn.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/princessAeryn.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/princessAeryn.oxw	2171-2479
/code/branches/ois_update/data/levels/princessAeryn.oxw	7506-7788
/code/branches/overlay/data/levels/princessAeryn.oxw	2117-2385
/code/branches/particles/data/levels/princessAeryn.oxw	2829-3085
/code/branches/particles2/data/levels/princessAeryn.oxw	6050-6106,6109
/code/branches/pch/data/levels/princessAeryn.oxw	3113-3194
/code/branches/physics/data/levels/princessAeryn.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/princessAeryn.oxw	2436-2457
/code/branches/pickup/data/levels/princessAeryn.oxw	8145-8555
/code/branches/pickup2/data/levels/princessAeryn.oxw	5942-6405
/code/branches/pickup3/data/levels/princessAeryn.oxw	6418-6523
/code/branches/pickup4/data/levels/princessAeryn.oxw	6594-6710
/code/branches/pickups/data/levels/princessAeryn.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/princessAeryn.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/princessAeryn.oxw	7262-7263
/code/branches/portals/data/levels/princessAeryn.oxw	8087-8455
/code/branches/portals2/data/levels/princessAeryn.oxw	8460-8602
/code/branches/ppspickups1/data/levels/princessAeryn.oxw	6552-6708
/code/branches/ppspickups2/data/levels/princessAeryn.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/princessAeryn.oxw	6757-6997
/code/branches/ppspickups4/data/levels/princessAeryn.oxw	7003-7089
/code/branches/presentation2/data/levels/princessAeryn.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/princessAeryn.oxw	6913-7162
/code/branches/questsystem/data/levels/princessAeryn.oxw	1894-2088
/code/branches/questsystem2/data/levels/princessAeryn.oxw	2107-2259
/code/branches/questsystem5/data/levels/princessAeryn.oxw	2776-2905
/code/branches/releasetodo/data/levels/princessAeryn.oxw	7614-7647
/code/branches/resource/data/levels/princessAeryn.oxw	3327-3366
/code/branches/resource2/data/levels/princessAeryn.oxw	3372-5694
/code/branches/rocket/data/levels/princessAeryn.oxw	6523-6950
/code/branches/rocket2/data/levels/princessAeryn.oxw	6953-6970
/code/branches/script_trigger/data/levels/princessAeryn.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/princessAeryn.oxw	6559-6989
/code/branches/sound/data/levels/princessAeryn.oxw	2829-3010
/code/branches/sound3/data/levels/princessAeryn.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/princessAeryn.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/princessAeryn.oxw	8460-8613
/code/branches/spacerace/data/levels/princessAeryn.oxw	8182-8630
/code/branches/steering/data/levels/princessAeryn.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/princessAeryn.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/princessAeryn.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/princessAeryn.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/princessAeryn.oxw	8453-8636
/code/branches/unity_build/data/levels/princessAeryn.oxw	8440-8716
/code/branches/weapon/data/levels/princessAeryn.oxw	1925-2094
/code/branches/weapon2/data/levels/princessAeryn.oxw	2107-2488
/code/branches/weapons/data/levels/princessAeryn.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/princessAeryn.oxw	2742-2890

code/branches/presentation2012/data/levels/quests.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/quests.oxw	merged	eligible
/code/branches/formation/data/levels/quests.oxw	merged	eligible
/code/branches/gamecontent/data/levels/quests.oxw	merged	eligible
/code/branches/hud/data/levels/quests.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/quests.oxw	merged	eligible
/code/branches/menue/data/levels/quests.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/quests.oxw	merged	eligible
/code/branches/output/data/levels/quests.oxw	merged	eligible
/code/branches/pickup2012/data/levels/quests.oxw	merged	eligible
/code/branches/presentation/data/levels/quests.oxw	merged	eligible
/code/branches/presentation2011/data/levels/quests.oxw	merged	eligible
/code/branches/shipSelection/data/levels/quests.oxw	merged	eligible
/code/branches/sound2012/data/levels/quests.oxw	merged	eligible
/code/branches/spacegate/data/levels/quests.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/quests.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/quests.oxw	merged	eligible
/code/trunk/data/levels/quests.oxw	merged	eligible
/code/branches/ai/data/levels/quests.oxw	6592-7033
/code/branches/ai2/data/levels/quests.oxw	8721-8880
/code/branches/bigships/data/levels/quests.oxw	8137-8588
/code/branches/buildsystem/data/levels/quests.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/quests.oxw	2506-2658
/code/branches/buildsystem3/data/levels/quests.oxw	2662-2708
/code/branches/ceguilua/data/levels/quests.oxw	1802-1808
/code/branches/chat/data/levels/quests.oxw	6527-6797
/code/branches/chat2/data/levels/quests.oxw	6836-6910
/code/branches/console/data/levels/quests.oxw	5941-6104
/code/branches/consolecommands2/data/levels/quests.oxw	6451-7178
/code/branches/consolecommands3/data/levels/quests.oxw	7178-7283
/code/branches/core3/data/levels/quests.oxw	1572-1739
/code/branches/core4/data/levels/quests.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/quests.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/quests.oxw	7537-7686
/code/branches/doc/data/levels/quests.oxw	7290-7400
/code/branches/dockingsystem/data/levels/quests.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/quests.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/quests.oxw	6584-7030
/code/branches/fps/data/levels/quests.oxw	6591-7072
/code/branches/gameimmersion/data/levels/quests.oxw	8102-8577
/code/branches/gamestate/data/levels/quests.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/quests.oxw	6594-6745
/code/branches/gametypes/data/levels/quests.oxw	2826-3031
/code/branches/gcc43/data/levels/quests.oxw	1580
/code/branches/gui/data/levels/quests.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/quests.oxw	6584-6941
/code/branches/hudimprovements/data/levels/quests.oxw	7920-8672
/code/branches/ingamemenu/data/levels/quests.oxw	6000-6023
/code/branches/input/data/levels/quests.oxw	1629-1636
/code/branches/ipv6/data/levels/quests.oxw	7293-7458
/code/branches/kicklib/data/levels/quests.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/quests.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/quests.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/quests.oxw	7903-8175
/code/branches/libraries/data/levels/quests.oxw	5612-5692
/code/branches/libraries2/data/levels/quests.oxw	5703-5737
/code/branches/lod/data/levels/quests.oxw	6586-6911
/code/branches/lodfinal/data/levels/quests.oxw	2372-2411
/code/branches/mac_osx/data/levels/quests.oxw	7789-8128,8135
/code/branches/map/data/levels/quests.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/quests.oxw	7502-7738
/code/branches/menu/data/levels/quests.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/quests.oxw	2754-2824
/code/branches/netp2/data/levels/quests.oxw	2835-2988
/code/branches/netp3/data/levels/quests.oxw	2988-3082
/code/branches/netp6/data/levels/quests.oxw	3214-3302
/code/branches/network/data/levels/quests.oxw	2356
/code/branches/network2/data/levels/quests.oxw	6434-6465
/code/branches/network3/data/levels/quests.oxw	7196-7344
/code/branches/network4/data/levels/quests.oxw	7497-7755
/code/branches/network5/data/levels/quests.oxw	7757-7781
/code/branches/network6/data/levels/quests.oxw	7823-8315
/code/branches/network64/data/levels/quests.oxw	2210-2355
/code/branches/notifications/data/levels/quests.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/quests.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/quests.oxw	2171-2479
/code/branches/ois_update/data/levels/quests.oxw	7506-7788
/code/branches/overlay/data/levels/quests.oxw	2117-2385
/code/branches/particles/data/levels/quests.oxw	2829-3085
/code/branches/particles2/data/levels/quests.oxw	6050-6106,6109
/code/branches/pch/data/levels/quests.oxw	3113-3194
/code/branches/physics/data/levels/quests.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/quests.oxw	2436-2457
/code/branches/pickup/data/levels/quests.oxw	8145-8555
/code/branches/pickup2/data/levels/quests.oxw	5942-6405
/code/branches/pickup3/data/levels/quests.oxw	6418-6523
/code/branches/pickup4/data/levels/quests.oxw	6594-6710
/code/branches/pickups/data/levels/quests.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/quests.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/quests.oxw	7262-7263
/code/branches/portals/data/levels/quests.oxw	8087-8455
/code/branches/portals2/data/levels/quests.oxw	8460-8602
/code/branches/ppspickups1/data/levels/quests.oxw	6552-6708
/code/branches/ppspickups2/data/levels/quests.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/quests.oxw	6757-6997
/code/branches/ppspickups4/data/levels/quests.oxw	7003-7089
/code/branches/presentation2/data/levels/quests.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/quests.oxw	6913-7162
/code/branches/questsystem/data/levels/quests.oxw	1894-2088
/code/branches/questsystem2/data/levels/quests.oxw	2107-2259
/code/branches/questsystem5/data/levels/quests.oxw	2776-2905
/code/branches/releasetodo/data/levels/quests.oxw	7614-7647
/code/branches/resource/data/levels/quests.oxw	3327-3366
/code/branches/resource2/data/levels/quests.oxw	3372-5694
/code/branches/rocket/data/levels/quests.oxw	6523-6950
/code/branches/rocket2/data/levels/quests.oxw	6953-6970
/code/branches/script_trigger/data/levels/quests.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/quests.oxw	6559-6989
/code/branches/sound/data/levels/quests.oxw	2829-3010
/code/branches/sound3/data/levels/quests.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/quests.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/quests.oxw	8460-8613
/code/branches/spacerace/data/levels/quests.oxw	8182-8630
/code/branches/steering/data/levels/quests.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/quests.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/quests.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/quests.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/quests.oxw	8453-8636
/code/branches/unity_build/data/levels/quests.oxw	8440-8716
/code/branches/usability/data/levels/quests.oxw	7915-8078
/code/branches/weapon/data/levels/quests.oxw	1925-2094
/code/branches/weapon2/data/levels/quests.oxw	2107-2488
/code/branches/weapons/data/levels/quests.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/quests.oxw	2742-2890

code/branches/presentation2012/data/levels/screenshot.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/screenshot.oxw	merged	eligible
/code/branches/environment3/data/levels/screenshot.oxw	merged	eligible
/code/branches/formation/data/levels/screenshot.oxw	merged	eligible
/code/branches/gamecontent/data/levels/screenshot.oxw	merged	eligible
/code/branches/hud/data/levels/screenshot.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/screenshot.oxw	merged	eligible
/code/branches/menue/data/levels/screenshot.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/screenshot.oxw	merged	eligible
/code/branches/output/data/levels/screenshot.oxw	merged	eligible
/code/branches/pickup2012/data/levels/screenshot.oxw	merged	eligible
/code/branches/presentation/data/levels/screenshot.oxw	merged	eligible
/code/branches/presentation2011/data/levels/screenshot.oxw	merged	eligible
/code/branches/shipSelection/data/levels/screenshot.oxw	merged	eligible
/code/branches/sound2012/data/levels/screenshot.oxw	merged	eligible
/code/branches/spacegate/data/levels/screenshot.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/screenshot.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/screenshot.oxw	merged	eligible
/code/branches/usability/data/levels/screenshot.oxw	merged	eligible
/code/trunk/data/levels/screenshot.oxw	merged	eligible
/code/branches/ai/data/levels/screenshot.oxw	6592-7033
/code/branches/ai2/data/levels/screenshot.oxw	8721-8880
/code/branches/bigships/data/levels/screenshot.oxw	8137-8588
/code/branches/buildsystem/data/levels/screenshot.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/screenshot.oxw	2506-2658
/code/branches/buildsystem3/data/levels/screenshot.oxw	2662-2708
/code/branches/ceguilua/data/levels/screenshot.oxw	1802-1808
/code/branches/chat/data/levels/screenshot.oxw	6527-6797
/code/branches/chat2/data/levels/screenshot.oxw	6836-6910
/code/branches/console/data/levels/screenshot.oxw	5941-6104
/code/branches/consolecommands2/data/levels/screenshot.oxw	6451-7178
/code/branches/consolecommands3/data/levels/screenshot.oxw	7178-7283
/code/branches/core3/data/levels/screenshot.oxw	1572-1739
/code/branches/core4/data/levels/screenshot.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/screenshot.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/screenshot.oxw	7537-7686
/code/branches/doc/data/levels/screenshot.oxw	7290-7400
/code/branches/dockingsystem/data/levels/screenshot.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/screenshot.oxw	6584-7030
/code/branches/fps/data/levels/screenshot.oxw	6591-7072
/code/branches/gameimmersion/data/levels/screenshot.oxw	8102-8577
/code/branches/gamestate/data/levels/screenshot.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/screenshot.oxw	6594-6745
/code/branches/gametypes/data/levels/screenshot.oxw	2826-3031
/code/branches/gcc43/data/levels/screenshot.oxw	1580
/code/branches/gui/data/levels/screenshot.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/screenshot.oxw	6584-6941
/code/branches/hudimprovements/data/levels/screenshot.oxw	7920-8672
/code/branches/ingamemenu/data/levels/screenshot.oxw	6000-6023
/code/branches/input/data/levels/screenshot.oxw	1629-1636
/code/branches/ipv6/data/levels/screenshot.oxw	7293-7458
/code/branches/kicklib/data/levels/screenshot.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/screenshot.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/screenshot.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/screenshot.oxw	7903-8175
/code/branches/libraries/data/levels/screenshot.oxw	5612-5692
/code/branches/libraries2/data/levels/screenshot.oxw	5703-5737
/code/branches/lod/data/levels/screenshot.oxw	6586-6911
/code/branches/lodfinal/data/levels/screenshot.oxw	2372-2411
/code/branches/mac_osx/data/levels/screenshot.oxw	7789-8128,8135
/code/branches/map/data/levels/screenshot.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/screenshot.oxw	7502-7738
/code/branches/menu/data/levels/screenshot.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/screenshot.oxw	2754-2824
/code/branches/netp2/data/levels/screenshot.oxw	2835-2988
/code/branches/netp3/data/levels/screenshot.oxw	2988-3082
/code/branches/netp6/data/levels/screenshot.oxw	3214-3302
/code/branches/network/data/levels/screenshot.oxw	2356
/code/branches/network2/data/levels/screenshot.oxw	6434-6465
/code/branches/network3/data/levels/screenshot.oxw	7196-7344
/code/branches/network4/data/levels/screenshot.oxw	7497-7755
/code/branches/network5/data/levels/screenshot.oxw	7757-7781
/code/branches/network6/data/levels/screenshot.oxw	7823-8315
/code/branches/network64/data/levels/screenshot.oxw	2210-2355
/code/branches/notifications/data/levels/screenshot.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/screenshot.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/screenshot.oxw	2171-2479
/code/branches/ois_update/data/levels/screenshot.oxw	7506-7788
/code/branches/overlay/data/levels/screenshot.oxw	2117-2385
/code/branches/particles/data/levels/screenshot.oxw	2829-3085
/code/branches/particles2/data/levels/screenshot.oxw	6050-6106,6109
/code/branches/pch/data/levels/screenshot.oxw	3113-3194
/code/branches/physics/data/levels/screenshot.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/screenshot.oxw	2436-2457
/code/branches/pickup/data/levels/screenshot.oxw	8145-8555
/code/branches/pickup2/data/levels/screenshot.oxw	5942-6405
/code/branches/pickup3/data/levels/screenshot.oxw	6418-6523
/code/branches/pickup4/data/levels/screenshot.oxw	6594-6710
/code/branches/pickups/data/levels/screenshot.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/screenshot.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/screenshot.oxw	7262-7263
/code/branches/portals/data/levels/screenshot.oxw	8087-8455
/code/branches/portals2/data/levels/screenshot.oxw	8460-8602
/code/branches/ppspickups1/data/levels/screenshot.oxw	6552-6708
/code/branches/ppspickups2/data/levels/screenshot.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/screenshot.oxw	6757-6997
/code/branches/ppspickups4/data/levels/screenshot.oxw	7003-7089
/code/branches/presentation2/data/levels/screenshot.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/screenshot.oxw	6913-7162
/code/branches/questsystem/data/levels/screenshot.oxw	1894-2088
/code/branches/questsystem2/data/levels/screenshot.oxw	2107-2259
/code/branches/questsystem5/data/levels/screenshot.oxw	2776-2905
/code/branches/releasetodo/data/levels/screenshot.oxw	7614-7647
/code/branches/resource/data/levels/screenshot.oxw	3327-3366
/code/branches/resource2/data/levels/screenshot.oxw	3372-5694
/code/branches/rocket/data/levels/screenshot.oxw	6523-6950
/code/branches/rocket2/data/levels/screenshot.oxw	6953-6970
/code/branches/script_trigger/data/levels/screenshot.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/screenshot.oxw	6559-6989
/code/branches/sound/data/levels/screenshot.oxw	2829-3010
/code/branches/sound3/data/levels/screenshot.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/screenshot.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/screenshot.oxw	8460-8613
/code/branches/spacerace/data/levels/screenshot.oxw	8182-8630
/code/branches/steering/data/levels/screenshot.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/screenshot.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/screenshot.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/screenshot.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/screenshot.oxw	8453-8636
/code/branches/unity_build/data/levels/screenshot.oxw	8440-8716
/code/branches/weapon/data/levels/screenshot.oxw	1925-2094
/code/branches/weapon2/data/levels/screenshot.oxw	2107-2488
/code/branches/weapons/data/levels/screenshot.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/screenshot.oxw	2742-2890

code/branches/presentation2012/data/levels/shieldTest.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/shieldTest.oxw	merged	eligible
/code/branches/formation/data/levels/shieldTest.oxw	merged	eligible
/code/branches/gamecontent/data/levels/shieldTest.oxw	merged	eligible
/code/branches/hud/data/levels/shieldTest.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/shieldTest.oxw	merged	eligible
/code/branches/menue/data/levels/shieldTest.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/shieldTest.oxw	merged	eligible
/code/branches/output/data/levels/shieldTest.oxw	merged	eligible
/code/branches/pickup2012/data/levels/shieldTest.oxw	merged	eligible
/code/branches/presentation/data/levels/shieldTest.oxw	merged	eligible
/code/branches/presentation2011/data/levels/shieldTest.oxw	merged	eligible
/code/branches/shipSelection/data/levels/shieldTest.oxw	merged	eligible
/code/branches/sound2012/data/levels/shieldTest.oxw	merged	eligible
/code/branches/spacegate/data/levels/shieldTest.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/shieldTest.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/shieldTest.oxw	merged	eligible
/code/trunk/data/levels/shieldTest.oxw	merged	eligible
/code/branches/ai/data/levels/shieldTest.oxw	6592-7033
/code/branches/ai2/data/levels/shieldTest.oxw	8721-8880
/code/branches/bigships/data/levels/shieldTest.oxw	8137-8588
/code/branches/buildsystem/data/levels/shieldTest.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/shieldTest.oxw	2506-2658
/code/branches/buildsystem3/data/levels/shieldTest.oxw	2662-2708
/code/branches/ceguilua/data/levels/shieldTest.oxw	1802-1808
/code/branches/chat/data/levels/shieldTest.oxw	6527-6797
/code/branches/chat2/data/levels/shieldTest.oxw	6836-6910
/code/branches/console/data/levels/shieldTest.oxw	5941-6104
/code/branches/consolecommands2/data/levels/shieldTest.oxw	6451-7178
/code/branches/consolecommands3/data/levels/shieldTest.oxw	7178-7283
/code/branches/core3/data/levels/shieldTest.oxw	1572-1739
/code/branches/core4/data/levels/shieldTest.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/shieldTest.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/shieldTest.oxw	7537-7686
/code/branches/doc/data/levels/shieldTest.oxw	7290-7400
/code/branches/dockingsystem/data/levels/shieldTest.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/shieldTest.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/shieldTest.oxw	6584-7030
/code/branches/fps/data/levels/shieldTest.oxw	6591-7072
/code/branches/gameimmersion/data/levels/shieldTest.oxw	8102-8577
/code/branches/gamestate/data/levels/shieldTest.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/shieldTest.oxw	6594-6745
/code/branches/gametypes/data/levels/shieldTest.oxw	2826-3031
/code/branches/gcc43/data/levels/shieldTest.oxw	1580
/code/branches/gui/data/levels/shieldTest.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/shieldTest.oxw	6584-6941
/code/branches/hudimprovements/data/levels/shieldTest.oxw	7920-8672
/code/branches/ingamemenu/data/levels/shieldTest.oxw	6000-6023
/code/branches/input/data/levels/shieldTest.oxw	1629-1636
/code/branches/ipv6/data/levels/shieldTest.oxw	7293-7458
/code/branches/kicklib/data/levels/shieldTest.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/shieldTest.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/shieldTest.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/shieldTest.oxw	7903-8175
/code/branches/libraries/data/levels/shieldTest.oxw	5612-5692
/code/branches/libraries2/data/levels/shieldTest.oxw	5703-5737
/code/branches/lod/data/levels/shieldTest.oxw	6586-6911
/code/branches/lodfinal/data/levels/shieldTest.oxw	2372-2411
/code/branches/mac_osx/data/levels/shieldTest.oxw	7789-8128,8135
/code/branches/map/data/levels/shieldTest.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/shieldTest.oxw	7502-7738
/code/branches/menu/data/levels/shieldTest.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/shieldTest.oxw	2754-2824
/code/branches/netp2/data/levels/shieldTest.oxw	2835-2988
/code/branches/netp3/data/levels/shieldTest.oxw	2988-3082
/code/branches/netp6/data/levels/shieldTest.oxw	3214-3302
/code/branches/network/data/levels/shieldTest.oxw	2356
/code/branches/network2/data/levels/shieldTest.oxw	6434-6465
/code/branches/network3/data/levels/shieldTest.oxw	7196-7344
/code/branches/network4/data/levels/shieldTest.oxw	7497-7755
/code/branches/network5/data/levels/shieldTest.oxw	7757-7781
/code/branches/network6/data/levels/shieldTest.oxw	7823-8315
/code/branches/network64/data/levels/shieldTest.oxw	2210-2355
/code/branches/notifications/data/levels/shieldTest.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/shieldTest.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/shieldTest.oxw	2171-2479
/code/branches/ois_update/data/levels/shieldTest.oxw	7506-7788
/code/branches/overlay/data/levels/shieldTest.oxw	2117-2385
/code/branches/particles/data/levels/shieldTest.oxw	2829-3085
/code/branches/particles2/data/levels/shieldTest.oxw	6050-6106,6109
/code/branches/pch/data/levels/shieldTest.oxw	3113-3194
/code/branches/physics/data/levels/shieldTest.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/shieldTest.oxw	2436-2457
/code/branches/pickup/data/levels/shieldTest.oxw	8145-8555
/code/branches/pickup2/data/levels/shieldTest.oxw	5942-6405
/code/branches/pickup3/data/levels/shieldTest.oxw	6418-6523
/code/branches/pickup4/data/levels/shieldTest.oxw	6594-6710
/code/branches/pickups/data/levels/shieldTest.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/shieldTest.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/shieldTest.oxw	7262-7263
/code/branches/portals/data/levels/shieldTest.oxw	8087-8455
/code/branches/portals2/data/levels/shieldTest.oxw	8460-8602
/code/branches/ppspickups1/data/levels/shieldTest.oxw	6552-6708
/code/branches/ppspickups2/data/levels/shieldTest.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/shieldTest.oxw	6757-6997
/code/branches/ppspickups4/data/levels/shieldTest.oxw	7003-7089
/code/branches/presentation2/data/levels/shieldTest.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/shieldTest.oxw	6913-7162
/code/branches/questsystem/data/levels/shieldTest.oxw	1894-2088
/code/branches/questsystem2/data/levels/shieldTest.oxw	2107-2259
/code/branches/questsystem5/data/levels/shieldTest.oxw	2776-2905
/code/branches/releasetodo/data/levels/shieldTest.oxw	7614-7647
/code/branches/resource/data/levels/shieldTest.oxw	3327-3366
/code/branches/resource2/data/levels/shieldTest.oxw	3372-5694
/code/branches/rocket/data/levels/shieldTest.oxw	6523-6950
/code/branches/rocket2/data/levels/shieldTest.oxw	6953-6970
/code/branches/script_trigger/data/levels/shieldTest.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/shieldTest.oxw	6559-6989
/code/branches/sound/data/levels/shieldTest.oxw	2829-3010
/code/branches/sound3/data/levels/shieldTest.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/shieldTest.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/shieldTest.oxw	8460-8613
/code/branches/spacerace/data/levels/shieldTest.oxw	8182-8630
/code/branches/steering/data/levels/shieldTest.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/shieldTest.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/shieldTest.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/shieldTest.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/shieldTest.oxw	8453-8636
/code/branches/unity_build/data/levels/shieldTest.oxw	8440-8716
/code/branches/usability/data/levels/shieldTest.oxw	7915-8078
/code/branches/weapon/data/levels/shieldTest.oxw	1925-2094
/code/branches/weapon2/data/levels/shieldTest.oxw	2107-2488
/code/branches/weapons/data/levels/shieldTest.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/shieldTest.oxw	2742-2890

code/branches/presentation2012/data/levels/sound.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/sound.oxw	merged	eligible
/code/branches/environment3/data/levels/sound.oxw	merged	eligible
/code/branches/formation/data/levels/sound.oxw	merged	eligible
/code/branches/gamecontent/data/levels/sound.oxw	merged	eligible
/code/branches/hud/data/levels/sound.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/sound.oxw	merged	eligible
/code/branches/menue/data/levels/sound.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/sound.oxw	merged	eligible
/code/branches/output/data/levels/sound.oxw	merged	eligible
/code/branches/pickup2012/data/levels/sound.oxw	merged	eligible
/code/branches/presentation/data/levels/sound.oxw	merged	eligible
/code/branches/presentation2011/data/levels/sound.oxw	merged	eligible
/code/branches/shipSelection/data/levels/sound.oxw	merged	eligible
/code/branches/sound2012/data/levels/sound.oxw	merged	eligible
/code/branches/spacegate/data/levels/sound.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/sound.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/sound.oxw	merged	eligible
/code/branches/usability/data/levels/sound.oxw	merged	eligible
/code/trunk/data/levels/sound.oxw	merged	eligible
/code/branches/ai/data/levels/sound.oxw	6592-7033
/code/branches/ai2/data/levels/sound.oxw	8721-8880
/code/branches/bigships/data/levels/sound.oxw	8137-8588
/code/branches/buildsystem/data/levels/sound.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/sound.oxw	2506-2658
/code/branches/buildsystem3/data/levels/sound.oxw	2662-2708
/code/branches/ceguilua/data/levels/sound.oxw	1802-1808
/code/branches/chat/data/levels/sound.oxw	6527-6797
/code/branches/chat2/data/levels/sound.oxw	6836-6910
/code/branches/console/data/levels/sound.oxw	5941-6104
/code/branches/consolecommands2/data/levels/sound.oxw	6451-7178
/code/branches/consolecommands3/data/levels/sound.oxw	7178-7283
/code/branches/core3/data/levels/sound.oxw	1572-1739
/code/branches/core4/data/levels/sound.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/sound.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/sound.oxw	7537-7686
/code/branches/doc/data/levels/sound.oxw	7290-7400
/code/branches/dockingsystem/data/levels/sound.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/sound.oxw	6584-7030
/code/branches/fps/data/levels/sound.oxw	6591-7072
/code/branches/gameimmersion/data/levels/sound.oxw	8102-8577
/code/branches/gamestate/data/levels/sound.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/sound.oxw	6594-6745
/code/branches/gametypes/data/levels/sound.oxw	2826-3031
/code/branches/gcc43/data/levels/sound.oxw	1580
/code/branches/gui/data/levels/sound.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/sound.oxw	6584-6941
/code/branches/hudimprovements/data/levels/sound.oxw	7920-8672
/code/branches/ingamemenu/data/levels/sound.oxw	6000-6023
/code/branches/input/data/levels/sound.oxw	1629-1636
/code/branches/ipv6/data/levels/sound.oxw	7293-7458
/code/branches/kicklib/data/levels/sound.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/sound.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/sound.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/sound.oxw	7903-8175
/code/branches/libraries/data/levels/sound.oxw	5612-5692
/code/branches/libraries2/data/levels/sound.oxw	5703-5737
/code/branches/lod/data/levels/sound.oxw	6586-6911
/code/branches/lodfinal/data/levels/sound.oxw	2372-2411
/code/branches/mac_osx/data/levels/sound.oxw	7789-8128,8135
/code/branches/map/data/levels/sound.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/sound.oxw	7502-7738
/code/branches/menu/data/levels/sound.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/sound.oxw	2754-2824
/code/branches/netp2/data/levels/sound.oxw	2835-2988
/code/branches/netp3/data/levels/sound.oxw	2988-3082
/code/branches/netp6/data/levels/sound.oxw	3214-3302
/code/branches/network/data/levels/sound.oxw	2356
/code/branches/network2/data/levels/sound.oxw	6434-6465
/code/branches/network3/data/levels/sound.oxw	7196-7344
/code/branches/network4/data/levels/sound.oxw	7497-7755
/code/branches/network5/data/levels/sound.oxw	7757-7781
/code/branches/network6/data/levels/sound.oxw	7823-8315
/code/branches/network64/data/levels/sound.oxw	2210-2355
/code/branches/notifications/data/levels/sound.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/sound.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/sound.oxw	2171-2479
/code/branches/ois_update/data/levels/sound.oxw	7506-7788
/code/branches/overlay/data/levels/sound.oxw	2117-2385
/code/branches/particles/data/levels/sound.oxw	2829-3085
/code/branches/particles2/data/levels/sound.oxw	6050-6106,6109
/code/branches/pch/data/levels/sound.oxw	3113-3194
/code/branches/physics/data/levels/sound.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/sound.oxw	2436-2457
/code/branches/pickup/data/levels/sound.oxw	8145-8555
/code/branches/pickup2/data/levels/sound.oxw	5942-6405
/code/branches/pickup3/data/levels/sound.oxw	6418-6523
/code/branches/pickup4/data/levels/sound.oxw	6594-6710
/code/branches/pickups/data/levels/sound.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/sound.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/sound.oxw	7262-7263
/code/branches/portals/data/levels/sound.oxw	8087-8455
/code/branches/portals2/data/levels/sound.oxw	8460-8602
/code/branches/ppspickups1/data/levels/sound.oxw	6552-6708
/code/branches/ppspickups2/data/levels/sound.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/sound.oxw	6757-6997
/code/branches/ppspickups4/data/levels/sound.oxw	7003-7089
/code/branches/presentation2/data/levels/sound.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/sound.oxw	6913-7162
/code/branches/questsystem/data/levels/sound.oxw	1894-2088
/code/branches/questsystem2/data/levels/sound.oxw	2107-2259
/code/branches/questsystem5/data/levels/sound.oxw	2776-2905
/code/branches/releasetodo/data/levels/sound.oxw	7614-7647
/code/branches/resource/data/levels/sound.oxw	3327-3366
/code/branches/resource2/data/levels/sound.oxw	3372-5694
/code/branches/rocket/data/levels/sound.oxw	6523-6950
/code/branches/rocket2/data/levels/sound.oxw	6953-6970
/code/branches/script_trigger/data/levels/sound.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/sound.oxw	6559-6989
/code/branches/sound/data/levels/sound.oxw	2829-3010
/code/branches/sound3/data/levels/sound.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/sound.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/sound.oxw	8460-8613
/code/branches/spacerace/data/levels/sound.oxw	8182-8630
/code/branches/steering/data/levels/sound.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/sound.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/sound.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/sound.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/sound.oxw	8453-8636
/code/branches/unity_build/data/levels/sound.oxw	8440-8716
/code/branches/weapon/data/levels/sound.oxw	1925-2094
/code/branches/weapon2/data/levels/sound.oxw	2107-2488
/code/branches/weapons/data/levels/sound.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/sound.oxw	2742-2890

code/branches/presentation2012/data/levels/spaceRace.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/spaceRace.oxw	merged	eligible
/code/branches/formation/data/levels/spaceRace.oxw	merged	eligible
/code/branches/gamecontent/data/levels/spaceRace.oxw	merged	eligible
/code/branches/hud/data/levels/spaceRace.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/spaceRace.oxw	merged	eligible
/code/branches/menue/data/levels/spaceRace.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/spaceRace.oxw	merged	eligible
/code/branches/output/data/levels/spaceRace.oxw	merged	eligible
/code/branches/pickup2012/data/levels/spaceRace.oxw	merged	eligible
/code/branches/presentation/data/levels/spaceRace.oxw	merged	eligible
/code/branches/presentation2011/data/levels/spaceRace.oxw	merged	eligible
/code/branches/shipSelection/data/levels/spaceRace.oxw	merged	eligible
/code/branches/sound2012/data/levels/spaceRace.oxw	merged	eligible
/code/branches/spacegate/data/levels/spaceRace.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/spaceRace.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/spaceRace.oxw	merged	eligible
/code/trunk/data/levels/spaceRace.oxw	merged	eligible
/code/branches/ai/data/levels/spaceRace.oxw	6592-7033
/code/branches/ai2/data/levels/spaceRace.oxw	8721-8880
/code/branches/bigships/data/levels/spaceRace.oxw	8137-8588
/code/branches/buildsystem/data/levels/spaceRace.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/spaceRace.oxw	2506-2658
/code/branches/buildsystem3/data/levels/spaceRace.oxw	2662-2708
/code/branches/ceguilua/data/levels/spaceRace.oxw	1802-1808
/code/branches/chat/data/levels/spaceRace.oxw	6527-6797
/code/branches/chat2/data/levels/spaceRace.oxw	6836-6910
/code/branches/console/data/levels/spaceRace.oxw	5941-6104
/code/branches/consolecommands2/data/levels/spaceRace.oxw	6451-7178
/code/branches/consolecommands3/data/levels/spaceRace.oxw	7178-7283
/code/branches/core3/data/levels/spaceRace.oxw	1572-1739
/code/branches/core4/data/levels/spaceRace.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/spaceRace.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/spaceRace.oxw	7537-7686
/code/branches/doc/data/levels/spaceRace.oxw	7290-7400
/code/branches/dockingsystem/data/levels/spaceRace.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/spaceRace.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/spaceRace.oxw	6584-7030
/code/branches/fps/data/levels/spaceRace.oxw	6591-7072
/code/branches/gameimmersion/data/levels/spaceRace.oxw	8102-8577
/code/branches/gamestate/data/levels/spaceRace.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/spaceRace.oxw	6594-6745
/code/branches/gametypes/data/levels/spaceRace.oxw	2826-3031
/code/branches/gcc43/data/levels/spaceRace.oxw	1580
/code/branches/gui/data/levels/spaceRace.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/spaceRace.oxw	6584-6941
/code/branches/hudimprovements/data/levels/spaceRace.oxw	7920-8672
/code/branches/ingamemenu/data/levels/spaceRace.oxw	6000-6023
/code/branches/input/data/levels/spaceRace.oxw	1629-1636
/code/branches/ipv6/data/levels/spaceRace.oxw	7293-7458
/code/branches/kicklib/data/levels/spaceRace.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/spaceRace.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/spaceRace.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/spaceRace.oxw	7903-8175
/code/branches/libraries/data/levels/spaceRace.oxw	5612-5692
/code/branches/libraries2/data/levels/spaceRace.oxw	5703-5737
/code/branches/lod/data/levels/spaceRace.oxw	6586-6911
/code/branches/lodfinal/data/levels/spaceRace.oxw	2372-2411
/code/branches/mac_osx/data/levels/spaceRace.oxw	7789-8128,8135
/code/branches/map/data/levels/spaceRace.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/spaceRace.oxw	7502-7738
/code/branches/menu/data/levels/spaceRace.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/spaceRace.oxw	2754-2824
/code/branches/netp2/data/levels/spaceRace.oxw	2835-2988
/code/branches/netp3/data/levels/spaceRace.oxw	2988-3082
/code/branches/netp6/data/levels/spaceRace.oxw	3214-3302
/code/branches/network/data/levels/spaceRace.oxw	2356
/code/branches/network2/data/levels/spaceRace.oxw	6434-6465
/code/branches/network3/data/levels/spaceRace.oxw	7196-7344
/code/branches/network4/data/levels/spaceRace.oxw	7497-7755
/code/branches/network5/data/levels/spaceRace.oxw	7757-7781
/code/branches/network6/data/levels/spaceRace.oxw	7823-8315
/code/branches/network64/data/levels/spaceRace.oxw	2210-2355
/code/branches/notifications/data/levels/spaceRace.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/spaceRace.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/spaceRace.oxw	2171-2479
/code/branches/ois_update/data/levels/spaceRace.oxw	7506-7788
/code/branches/overlay/data/levels/spaceRace.oxw	2117-2385
/code/branches/particles/data/levels/spaceRace.oxw	2829-3085
/code/branches/particles2/data/levels/spaceRace.oxw	6050-6106,6109
/code/branches/pch/data/levels/spaceRace.oxw	3113-3194
/code/branches/physics/data/levels/spaceRace.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/spaceRace.oxw	2436-2457
/code/branches/pickup/data/levels/spaceRace.oxw	8145-8555
/code/branches/pickup2/data/levels/spaceRace.oxw	5942-6405
/code/branches/pickup3/data/levels/spaceRace.oxw	6418-6523
/code/branches/pickup4/data/levels/spaceRace.oxw	6594-6710
/code/branches/pickups/data/levels/spaceRace.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/spaceRace.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/spaceRace.oxw	7262-7263
/code/branches/portals/data/levels/spaceRace.oxw	8087-8455
/code/branches/portals2/data/levels/spaceRace.oxw	8460-8602
/code/branches/ppspickups1/data/levels/spaceRace.oxw	6552-6708
/code/branches/ppspickups2/data/levels/spaceRace.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/spaceRace.oxw	6757-6997
/code/branches/ppspickups4/data/levels/spaceRace.oxw	7003-7089
/code/branches/presentation2/data/levels/spaceRace.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/spaceRace.oxw	6913-7162
/code/branches/questsystem/data/levels/spaceRace.oxw	1894-2088
/code/branches/questsystem2/data/levels/spaceRace.oxw	2107-2259
/code/branches/questsystem5/data/levels/spaceRace.oxw	2776-2905
/code/branches/releasetodo/data/levels/spaceRace.oxw	7614-7647
/code/branches/resource/data/levels/spaceRace.oxw	3327-3366
/code/branches/resource2/data/levels/spaceRace.oxw	3372-5694
/code/branches/rocket/data/levels/spaceRace.oxw	6523-6950
/code/branches/rocket2/data/levels/spaceRace.oxw	6953-6970
/code/branches/script_trigger/data/levels/spaceRace.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/spaceRace.oxw	6559-6989
/code/branches/sound/data/levels/spaceRace.oxw	2829-3010
/code/branches/sound3/data/levels/spaceRace.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/spaceRace.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/spaceRace.oxw	8460-8613
/code/branches/spacerace/data/levels/spaceRace.oxw	8182-8630
/code/branches/steering/data/levels/spaceRace.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/spaceRace.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/spaceRace.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/spaceRace.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/spaceRace.oxw	8453-8636
/code/branches/unity_build/data/levels/spaceRace.oxw	8440-8716
/code/branches/usability/data/levels/spaceRace.oxw	7915-8078
/code/branches/weapon/data/levels/spaceRace.oxw	1925-2094
/code/branches/weapon2/data/levels/spaceRace.oxw	2107-2488
/code/branches/weapons/data/levels/spaceRace.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/spaceRace.oxw	2742-2890

code/branches/presentation2012/data/levels/surfaceRace.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/surfaceRace/data/levels/surfaceRace.oxw	merged	eligible
/code/branches/ai/data/levels/surfaceRace.oxw	6592-7033
/code/branches/ai2/data/levels/surfaceRace.oxw	8721-8880
/code/branches/bigships/data/levels/surfaceRace.oxw	8137-8588
/code/branches/buildsystem/data/levels/surfaceRace.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/surfaceRace.oxw	2506-2658
/code/branches/buildsystem3/data/levels/surfaceRace.oxw	2662-2708
/code/branches/ceguilua/data/levels/surfaceRace.oxw	1802-1808
/code/branches/chat/data/levels/surfaceRace.oxw	6527-6797
/code/branches/chat2/data/levels/surfaceRace.oxw	6836-6910
/code/branches/console/data/levels/surfaceRace.oxw	5941-6104
/code/branches/consolecommands2/data/levels/surfaceRace.oxw	6451-7178
/code/branches/consolecommands3/data/levels/surfaceRace.oxw	7178-7283
/code/branches/core3/data/levels/surfaceRace.oxw	1572-1739
/code/branches/core4/data/levels/surfaceRace.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/surfaceRace.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/surfaceRace.oxw	7537-7686
/code/branches/doc/data/levels/surfaceRace.oxw	7290-7400
/code/branches/dockingsystem/data/levels/surfaceRace.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/surfaceRace.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/surfaceRace.oxw	6584-7030
/code/branches/environment3/data/levels/surfaceRace.oxw	8887-8975
/code/branches/formation/data/levels/surfaceRace.oxw	8885-8991
/code/branches/fps/data/levels/surfaceRace.oxw	6591-7072
/code/branches/gamecontent/data/levels/surfaceRace.oxw	8893-8968
/code/branches/gameimmersion/data/levels/surfaceRace.oxw	8102-8577
/code/branches/gamestate/data/levels/surfaceRace.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/surfaceRace.oxw	6594-6745
/code/branches/gametypes/data/levels/surfaceRace.oxw	2826-3031
/code/branches/gcc43/data/levels/surfaceRace.oxw	1580
/code/branches/gui/data/levels/surfaceRace.oxw	1635-1723,2795-2894
/code/branches/hud/data/levels/surfaceRace.oxw	8883-8986
/code/branches/hudelements/data/levels/surfaceRace.oxw	6584-6941
/code/branches/hudimprovements/data/levels/surfaceRace.oxw	7920-8672
/code/branches/ingamemenu/data/levels/surfaceRace.oxw	6000-6023
/code/branches/input/data/levels/surfaceRace.oxw	1629-1636
/code/branches/ipv6/data/levels/surfaceRace.oxw	7293-7458
/code/branches/kicklib/data/levels/surfaceRace.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/surfaceRace.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/surfaceRace.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/surfaceRace.oxw	7903-8175
/code/branches/libraries/data/levels/surfaceRace.oxw	5612-5692
/code/branches/libraries2/data/levels/surfaceRace.oxw	5703-5737
/code/branches/lod/data/levels/surfaceRace.oxw	6586-6911
/code/branches/lodfinal/data/levels/surfaceRace.oxw	2372-2411
/code/branches/mac_osx/data/levels/surfaceRace.oxw	7789-8128,8135
/code/branches/map/data/levels/surfaceRace.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/surfaceRace.oxw	7502-7738
/code/branches/masterserverfix/data/levels/surfaceRace.oxw	8933-8936
/code/branches/menu/data/levels/surfaceRace.oxw	5941-6146,6148,7536-7687
/code/branches/menue/data/levels/surfaceRace.oxw	8884-8976
/code/branches/miniprojects/data/levels/surfaceRace.oxw	2754-2824
/code/branches/netp2/data/levels/surfaceRace.oxw	2835-2988
/code/branches/netp3/data/levels/surfaceRace.oxw	2988-3082
/code/branches/netp6/data/levels/surfaceRace.oxw	3214-3302
/code/branches/network/data/levels/surfaceRace.oxw	2356
/code/branches/network2/data/levels/surfaceRace.oxw	6434-6465
/code/branches/network3/data/levels/surfaceRace.oxw	7196-7344
/code/branches/network4/data/levels/surfaceRace.oxw	7497-7755
/code/branches/network5/data/levels/surfaceRace.oxw	7757-7781
/code/branches/network6/data/levels/surfaceRace.oxw	7823-8315
/code/branches/network64/data/levels/surfaceRace.oxw	2210-2355
/code/branches/newlevel2012/data/levels/surfaceRace.oxw	9033-9240
/code/branches/notifications/data/levels/surfaceRace.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/surfaceRace.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/surfaceRace.oxw	2171-2479
/code/branches/ois_update/data/levels/surfaceRace.oxw	7506-7788
/code/branches/output/data/levels/surfaceRace.oxw	8739-8857
/code/branches/overlay/data/levels/surfaceRace.oxw	2117-2385
/code/branches/particles/data/levels/surfaceRace.oxw	2829-3085
/code/branches/particles2/data/levels/surfaceRace.oxw	6050-6106,6109
/code/branches/pch/data/levels/surfaceRace.oxw	3113-3194
/code/branches/physics/data/levels/surfaceRace.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/surfaceRace.oxw	2436-2457
/code/branches/pickup/data/levels/surfaceRace.oxw	8145-8555
/code/branches/pickup2/data/levels/surfaceRace.oxw	5942-6405
/code/branches/pickup2012/data/levels/surfaceRace.oxw	9029-9189
/code/branches/pickup3/data/levels/surfaceRace.oxw	6418-6523
/code/branches/pickup4/data/levels/surfaceRace.oxw	6594-6710
/code/branches/pickups/data/levels/surfaceRace.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/surfaceRace.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/surfaceRace.oxw	7262-7263
/code/branches/portals/data/levels/surfaceRace.oxw	8087-8455
/code/branches/portals2/data/levels/surfaceRace.oxw	8460-8602
/code/branches/ppspickups1/data/levels/surfaceRace.oxw	6552-6708
/code/branches/ppspickups2/data/levels/surfaceRace.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/surfaceRace.oxw	6757-6997
/code/branches/ppspickups4/data/levels/surfaceRace.oxw	7003-7089
/code/branches/presentation/data/levels/surfaceRace.oxw	2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/surfaceRace.oxw	6106-6416,7787-7800
/code/branches/presentation2011/data/levels/surfaceRace.oxw	8974-9015
/code/branches/presentation3/data/levels/surfaceRace.oxw	6913-7162
/code/branches/questsystem/data/levels/surfaceRace.oxw	1894-2088
/code/branches/questsystem2/data/levels/surfaceRace.oxw	2107-2259
/code/branches/questsystem5/data/levels/surfaceRace.oxw	2776-2905
/code/branches/releasetodo/data/levels/surfaceRace.oxw	7614-7647
/code/branches/resource/data/levels/surfaceRace.oxw	3327-3366
/code/branches/resource2/data/levels/surfaceRace.oxw	3372-5694
/code/branches/rocket/data/levels/surfaceRace.oxw	6523-6950
/code/branches/rocket2/data/levels/surfaceRace.oxw	6953-6970
/code/branches/script_trigger/data/levels/surfaceRace.oxw	1295-1953,1955
/code/branches/shipSelection/data/levels/surfaceRace.oxw	9038-9206
/code/branches/skybox2/data/levels/surfaceRace.oxw	6559-6989
/code/branches/sound/data/levels/surfaceRace.oxw	2829-3010
/code/branches/sound2012/data/levels/surfaceRace.oxw	9205-9240
/code/branches/sound3/data/levels/surfaceRace.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/surfaceRace.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/surfaceRace.oxw	8460-8613
/code/branches/spacegate/data/levels/surfaceRace.oxw	9030-9215
/code/branches/spacerace/data/levels/surfaceRace.oxw	8182-8630
/code/branches/spaceraceTwo/data/levels/surfaceRace.oxw	8881-8996
/code/branches/steering/data/levels/surfaceRace.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/surfaceRace.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/surfaceRace.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/surfaceRace.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/surfaceRace.oxw	8453-8636
/code/branches/unity_build/data/levels/surfaceRace.oxw	8440-8716
/code/branches/usability/data/levels/surfaceRace.oxw	7915-8078
/code/branches/weapon/data/levels/surfaceRace.oxw	1925-2094
/code/branches/weapon2/data/levels/surfaceRace.oxw	2107-2488
/code/branches/weapons/data/levels/surfaceRace.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/surfaceRace.oxw	2742-2890
/code/trunk/data/levels/surfaceRace.oxw	9189-9204

code/branches/presentation2012/data/levels/teamBaseMatch.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/environment3/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/formation/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/gamecontent/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/hud/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/menue/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/output/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/pickup2012/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/presentation/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/presentation2011/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/shipSelection/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/sound2012/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/spacegate/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/usability/data/levels/teamBaseMatch.oxw	merged	eligible
/code/trunk/data/levels/teamBaseMatch.oxw	merged	eligible
/code/branches/ai/data/levels/teamBaseMatch.oxw	6592-7033
/code/branches/ai2/data/levels/teamBaseMatch.oxw	8721-8880
/code/branches/bigships/data/levels/teamBaseMatch.oxw	8137-8588
/code/branches/buildsystem/data/levels/teamBaseMatch.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/teamBaseMatch.oxw	2506-2658
/code/branches/buildsystem3/data/levels/teamBaseMatch.oxw	2662-2708
/code/branches/ceguilua/data/levels/teamBaseMatch.oxw	1802-1808
/code/branches/chat/data/levels/teamBaseMatch.oxw	6527-6797
/code/branches/chat2/data/levels/teamBaseMatch.oxw	6836-6910
/code/branches/console/data/levels/teamBaseMatch.oxw	5941-6104
/code/branches/consolecommands2/data/levels/teamBaseMatch.oxw	6451-7178
/code/branches/consolecommands3/data/levels/teamBaseMatch.oxw	7178-7283
/code/branches/core3/data/levels/teamBaseMatch.oxw	1572-1739
/code/branches/core4/data/levels/teamBaseMatch.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/teamBaseMatch.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/teamBaseMatch.oxw	7537-7686
/code/branches/doc/data/levels/teamBaseMatch.oxw	7290-7400
/code/branches/dockingsystem/data/levels/teamBaseMatch.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/teamBaseMatch.oxw	6584-7030
/code/branches/fps/data/levels/teamBaseMatch.oxw	6591-7072
/code/branches/gameimmersion/data/levels/teamBaseMatch.oxw	8102-8577
/code/branches/gamestate/data/levels/teamBaseMatch.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/teamBaseMatch.oxw	6594-6745
/code/branches/gametypes/data/levels/teamBaseMatch.oxw	2826-3031
/code/branches/gcc43/data/levels/teamBaseMatch.oxw	1580
/code/branches/gui/data/levels/teamBaseMatch.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/teamBaseMatch.oxw	6584-6941
/code/branches/hudimprovements/data/levels/teamBaseMatch.oxw	7920-8672
/code/branches/ingamemenu/data/levels/teamBaseMatch.oxw	6000-6023
/code/branches/input/data/levels/teamBaseMatch.oxw	1629-1636
/code/branches/ipv6/data/levels/teamBaseMatch.oxw	7293-7458
/code/branches/kicklib/data/levels/teamBaseMatch.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/teamBaseMatch.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/teamBaseMatch.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/teamBaseMatch.oxw	7903-8175
/code/branches/libraries/data/levels/teamBaseMatch.oxw	5612-5692
/code/branches/libraries2/data/levels/teamBaseMatch.oxw	5703-5737
/code/branches/lod/data/levels/teamBaseMatch.oxw	6586-6911
/code/branches/lodfinal/data/levels/teamBaseMatch.oxw	2372-2411
/code/branches/mac_osx/data/levels/teamBaseMatch.oxw	7789-8128,8135
/code/branches/map/data/levels/teamBaseMatch.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/teamBaseMatch.oxw	7502-7738
/code/branches/menu/data/levels/teamBaseMatch.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/teamBaseMatch.oxw	2754-2824
/code/branches/netp2/data/levels/teamBaseMatch.oxw	2835-2988
/code/branches/netp3/data/levels/teamBaseMatch.oxw	2988-3082
/code/branches/netp6/data/levels/teamBaseMatch.oxw	3214-3302
/code/branches/network/data/levels/teamBaseMatch.oxw	2356
/code/branches/network2/data/levels/teamBaseMatch.oxw	6434-6465
/code/branches/network3/data/levels/teamBaseMatch.oxw	7196-7344
/code/branches/network4/data/levels/teamBaseMatch.oxw	7497-7755
/code/branches/network5/data/levels/teamBaseMatch.oxw	7757-7781
/code/branches/network6/data/levels/teamBaseMatch.oxw	7823-8315
/code/branches/network64/data/levels/teamBaseMatch.oxw	2210-2355
/code/branches/notifications/data/levels/teamBaseMatch.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/teamBaseMatch.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/teamBaseMatch.oxw	2171-2479
/code/branches/ois_update/data/levels/teamBaseMatch.oxw	7506-7788
/code/branches/overlay/data/levels/teamBaseMatch.oxw	2117-2385
/code/branches/particles/data/levels/teamBaseMatch.oxw	2829-3085
/code/branches/particles2/data/levels/teamBaseMatch.oxw	6050-6106,6109
/code/branches/pch/data/levels/teamBaseMatch.oxw	3113-3194
/code/branches/physics/data/levels/teamBaseMatch.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/teamBaseMatch.oxw	2436-2457
/code/branches/pickup/data/levels/teamBaseMatch.oxw	8145-8555
/code/branches/pickup2/data/levels/teamBaseMatch.oxw	5942-6405
/code/branches/pickup3/data/levels/teamBaseMatch.oxw	6418-6523
/code/branches/pickup4/data/levels/teamBaseMatch.oxw	6594-6710
/code/branches/pickups/data/levels/teamBaseMatch.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/teamBaseMatch.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/teamBaseMatch.oxw	7262-7263
/code/branches/portals/data/levels/teamBaseMatch.oxw	8087-8455
/code/branches/portals2/data/levels/teamBaseMatch.oxw	8460-8602
/code/branches/ppspickups1/data/levels/teamBaseMatch.oxw	6552-6708
/code/branches/ppspickups2/data/levels/teamBaseMatch.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/teamBaseMatch.oxw	6757-6997
/code/branches/ppspickups4/data/levels/teamBaseMatch.oxw	7003-7089
/code/branches/presentation2/data/levels/teamBaseMatch.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/teamBaseMatch.oxw	6913-7162
/code/branches/questsystem/data/levels/teamBaseMatch.oxw	1894-2088
/code/branches/questsystem2/data/levels/teamBaseMatch.oxw	2107-2259
/code/branches/questsystem5/data/levels/teamBaseMatch.oxw	2776-2905
/code/branches/releasetodo/data/levels/teamBaseMatch.oxw	7614-7647
/code/branches/resource/data/levels/teamBaseMatch.oxw	3327-3366
/code/branches/resource2/data/levels/teamBaseMatch.oxw	3372-5694
/code/branches/rocket/data/levels/teamBaseMatch.oxw	6523-6950
/code/branches/rocket2/data/levels/teamBaseMatch.oxw	6953-6970
/code/branches/script_trigger/data/levels/teamBaseMatch.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/teamBaseMatch.oxw	6559-6989
/code/branches/sound/data/levels/teamBaseMatch.oxw	2829-3010
/code/branches/sound3/data/levels/teamBaseMatch.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/teamBaseMatch.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/teamBaseMatch.oxw	8460-8613
/code/branches/spacerace/data/levels/teamBaseMatch.oxw	8182-8630
/code/branches/steering/data/levels/teamBaseMatch.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/teamBaseMatch.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/teamBaseMatch.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/teamBaseMatch.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/teamBaseMatch.oxw	8453-8636
/code/branches/unity_build/data/levels/teamBaseMatch.oxw	8440-8716
/code/branches/weapon/data/levels/teamBaseMatch.oxw	1925-2094
/code/branches/weapon2/data/levels/teamBaseMatch.oxw	2107-2488
/code/branches/weapons/data/levels/teamBaseMatch.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/teamBaseMatch.oxw	2742-2890

code/branches/presentation2012/data/levels/teamDeathMatch.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/environment3/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/formation/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/gamecontent/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/hud/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/menue/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/output/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/pickup2012/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/presentation/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/presentation2011/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/shipSelection/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/sound2012/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/spacegate/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/usability/data/levels/teamDeathMatch.oxw	merged	eligible
/code/trunk/data/levels/teamDeathMatch.oxw	merged	eligible
/code/branches/ai/data/levels/teamDeathMatch.oxw	6592-7033
/code/branches/ai2/data/levels/teamDeathMatch.oxw	8721-8880
/code/branches/bigships/data/levels/teamDeathMatch.oxw	8137-8588
/code/branches/buildsystem/data/levels/teamDeathMatch.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/teamDeathMatch.oxw	2506-2658
/code/branches/buildsystem3/data/levels/teamDeathMatch.oxw	2662-2708
/code/branches/ceguilua/data/levels/teamDeathMatch.oxw	1802-1808
/code/branches/chat/data/levels/teamDeathMatch.oxw	6527-6797
/code/branches/chat2/data/levels/teamDeathMatch.oxw	6836-6910
/code/branches/console/data/levels/teamDeathMatch.oxw	5941-6104
/code/branches/consolecommands2/data/levels/teamDeathMatch.oxw	6451-7178
/code/branches/consolecommands3/data/levels/teamDeathMatch.oxw	7178-7283
/code/branches/core3/data/levels/teamDeathMatch.oxw	1572-1739
/code/branches/core4/data/levels/teamDeathMatch.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/teamDeathMatch.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/teamDeathMatch.oxw	7537-7686
/code/branches/doc/data/levels/teamDeathMatch.oxw	7290-7400
/code/branches/dockingsystem/data/levels/teamDeathMatch.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/teamDeathMatch.oxw	6584-7030
/code/branches/fps/data/levels/teamDeathMatch.oxw	6591-7072
/code/branches/gameimmersion/data/levels/teamDeathMatch.oxw	8102-8577
/code/branches/gamestate/data/levels/teamDeathMatch.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/teamDeathMatch.oxw	6594-6745
/code/branches/gametypes/data/levels/teamDeathMatch.oxw	2826-3031
/code/branches/gcc43/data/levels/teamDeathMatch.oxw	1580
/code/branches/gui/data/levels/teamDeathMatch.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/teamDeathMatch.oxw	6584-6941
/code/branches/hudimprovements/data/levels/teamDeathMatch.oxw	7920-8672
/code/branches/ingamemenu/data/levels/teamDeathMatch.oxw	6000-6023
/code/branches/input/data/levels/teamDeathMatch.oxw	1629-1636
/code/branches/ipv6/data/levels/teamDeathMatch.oxw	7293-7458
/code/branches/kicklib/data/levels/teamDeathMatch.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/teamDeathMatch.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/teamDeathMatch.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/teamDeathMatch.oxw	7903-8175
/code/branches/libraries/data/levels/teamDeathMatch.oxw	5612-5692
/code/branches/libraries2/data/levels/teamDeathMatch.oxw	5703-5737
/code/branches/lod/data/levels/teamDeathMatch.oxw	6586-6911
/code/branches/lodfinal/data/levels/teamDeathMatch.oxw	2372-2411
/code/branches/mac_osx/data/levels/teamDeathMatch.oxw	7789-8128,8135
/code/branches/map/data/levels/teamDeathMatch.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/teamDeathMatch.oxw	7502-7738
/code/branches/menu/data/levels/teamDeathMatch.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/teamDeathMatch.oxw	2754-2824
/code/branches/netp2/data/levels/teamDeathMatch.oxw	2835-2988
/code/branches/netp3/data/levels/teamDeathMatch.oxw	2988-3082
/code/branches/netp6/data/levels/teamDeathMatch.oxw	3214-3302
/code/branches/network/data/levels/teamDeathMatch.oxw	2356
/code/branches/network2/data/levels/teamDeathMatch.oxw	6434-6465
/code/branches/network3/data/levels/teamDeathMatch.oxw	7196-7344
/code/branches/network4/data/levels/teamDeathMatch.oxw	7497-7755
/code/branches/network5/data/levels/teamDeathMatch.oxw	7757-7781
/code/branches/network6/data/levels/teamDeathMatch.oxw	7823-8315
/code/branches/network64/data/levels/teamDeathMatch.oxw	2210-2355
/code/branches/notifications/data/levels/teamDeathMatch.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/teamDeathMatch.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/teamDeathMatch.oxw	2171-2479
/code/branches/ois_update/data/levels/teamDeathMatch.oxw	7506-7788
/code/branches/overlay/data/levels/teamDeathMatch.oxw	2117-2385
/code/branches/particles/data/levels/teamDeathMatch.oxw	2829-3085
/code/branches/particles2/data/levels/teamDeathMatch.oxw	6050-6106,6109
/code/branches/pch/data/levels/teamDeathMatch.oxw	3113-3194
/code/branches/physics/data/levels/teamDeathMatch.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/teamDeathMatch.oxw	2436-2457
/code/branches/pickup/data/levels/teamDeathMatch.oxw	8145-8555
/code/branches/pickup2/data/levels/teamDeathMatch.oxw	5942-6405
/code/branches/pickup3/data/levels/teamDeathMatch.oxw	6418-6523
/code/branches/pickup4/data/levels/teamDeathMatch.oxw	6594-6710
/code/branches/pickups/data/levels/teamDeathMatch.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/teamDeathMatch.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/teamDeathMatch.oxw	7262-7263
/code/branches/portals/data/levels/teamDeathMatch.oxw	8087-8455
/code/branches/portals2/data/levels/teamDeathMatch.oxw	8460-8602
/code/branches/ppspickups1/data/levels/teamDeathMatch.oxw	6552-6708
/code/branches/ppspickups2/data/levels/teamDeathMatch.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/teamDeathMatch.oxw	6757-6997
/code/branches/ppspickups4/data/levels/teamDeathMatch.oxw	7003-7089
/code/branches/presentation2/data/levels/teamDeathMatch.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/teamDeathMatch.oxw	6913-7162
/code/branches/questsystem/data/levels/teamDeathMatch.oxw	1894-2088
/code/branches/questsystem2/data/levels/teamDeathMatch.oxw	2107-2259
/code/branches/questsystem5/data/levels/teamDeathMatch.oxw	2776-2905
/code/branches/releasetodo/data/levels/teamDeathMatch.oxw	7614-7647
/code/branches/resource/data/levels/teamDeathMatch.oxw	3327-3366
/code/branches/resource2/data/levels/teamDeathMatch.oxw	3372-5694
/code/branches/rocket/data/levels/teamDeathMatch.oxw	6523-6950
/code/branches/rocket2/data/levels/teamDeathMatch.oxw	6953-6970
/code/branches/script_trigger/data/levels/teamDeathMatch.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/teamDeathMatch.oxw	6559-6989
/code/branches/sound/data/levels/teamDeathMatch.oxw	2829-3010
/code/branches/sound3/data/levels/teamDeathMatch.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/teamDeathMatch.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/teamDeathMatch.oxw	8460-8613
/code/branches/spacerace/data/levels/teamDeathMatch.oxw	8182-8630
/code/branches/steering/data/levels/teamDeathMatch.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/teamDeathMatch.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/teamDeathMatch.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/teamDeathMatch.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/teamDeathMatch.oxw	8453-8636
/code/branches/unity_build/data/levels/teamDeathMatch.oxw	8440-8716
/code/branches/weapon/data/levels/teamDeathMatch.oxw	1925-2094
/code/branches/weapon2/data/levels/teamDeathMatch.oxw	2107-2488
/code/branches/weapons/data/levels/teamDeathMatch.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/teamDeathMatch.oxw	2742-2890

code/branches/presentation2012/data/levels/templates

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates	merged	eligible
/code/branches/environment3/data/levels/templates	merged	eligible
/code/branches/formation/data/levels/templates	merged	eligible
/code/branches/gamecontent/data/levels/templates	merged	eligible
/code/branches/hud/data/levels/templates	merged	eligible
/code/branches/masterserverfix/data/levels/templates	merged	eligible
/code/branches/menue/data/levels/templates	merged	eligible
/code/branches/newlevel2012/data/levels/templates	merged	eligible
/code/branches/output/data/levels/templates	merged	eligible
/code/branches/pickup2012/data/levels/templates	merged	eligible
/code/branches/presentation/data/levels/templates	merged	eligible
/code/branches/presentation2011/data/levels/templates	merged	eligible
/code/branches/shipSelection/data/levels/templates	merged	eligible
/code/branches/sound2012/data/levels/templates	merged	non-inheritable	eligible
/code/branches/spacegate/data/levels/templates	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates	merged	eligible
/code/branches/surfaceRace/data/levels/templates	merged	eligible
/code/branches/usability/data/levels/templates	merged	eligible
/code/trunk/data/levels/templates	merged	eligible
/code/branches/ai/data/levels/templates	6592-7033
/code/branches/ai2/data/levels/templates	8721-8880
/code/branches/bigships/data/levels/templates	8137-8588
/code/branches/buildsystem/data/levels/templates	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates	2506-2658
/code/branches/buildsystem3/data/levels/templates	2662-2708
/code/branches/ceguilua/data/levels/templates	1802-1808
/code/branches/chat/data/levels/templates	6527-6797
/code/branches/chat2/data/levels/templates	6836-6910
/code/branches/console/data/levels/templates	5941-6104
/code/branches/consolecommands2/data/levels/templates	6451-7178
/code/branches/consolecommands3/data/levels/templates	7178-7283
/code/branches/core3/data/levels/templates	1572-1739
/code/branches/core4/data/levels/templates	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates	7537-7686
/code/branches/doc/data/levels/templates	7290-7400
/code/branches/dockingsystem/data/levels/templates	8101-8192
/code/branches/dynamicmatch/data/levels/templates	6584-7030
/code/branches/fps/data/levels/templates	6591-7072
/code/branches/gameimmersion/data/levels/templates	8102-8577
/code/branches/gamestate/data/levels/templates	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates	6594-6745
/code/branches/gametypes/data/levels/templates	2826-3031
/code/branches/gcc43/data/levels/templates	1580
/code/branches/gui/data/levels/templates	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates	6584-6941
/code/branches/hudimprovements/data/levels/templates	7920-8672
/code/branches/ingamemenu/data/levels/templates	6000-6023
/code/branches/input/data/levels/templates	1629-1636
/code/branches/ipv6/data/levels/templates	7293-7458
/code/branches/kicklib/data/levels/templates	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates	8282-8350
/code/branches/lastmanstanding/data/levels/templates	7479-7644
/code/branches/lastmanstanding3/data/levels/templates	7903-8175
/code/branches/libraries/data/levels/templates	5612-5692
/code/branches/libraries2/data/levels/templates	5703-5737
/code/branches/lod/data/levels/templates	6586-6911
/code/branches/lodfinal/data/levels/templates	2372-2411
/code/branches/mac_osx/data/levels/templates	7789-8128,8135
/code/branches/map/data/levels/templates	2801-3086,3089
/code/branches/masterserver/data/levels/templates	7502-7738
/code/branches/menu/data/levels/templates	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates	2754-2824
/code/branches/netp2/data/levels/templates	2835-2988
/code/branches/netp3/data/levels/templates	2988-3082
/code/branches/netp6/data/levels/templates	3214-3302
/code/branches/network/data/levels/templates	2356
/code/branches/network2/data/levels/templates	6434-6465
/code/branches/network3/data/levels/templates	7196-7344
/code/branches/network4/data/levels/templates	7497-7755
/code/branches/network5/data/levels/templates	7757-7781
/code/branches/network6/data/levels/templates	7823-8315
/code/branches/network64/data/levels/templates	2210-2355
/code/branches/notifications/data/levels/templates	7314-7401
/code/branches/objecthierarchy/data/levels/templates	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates	2171-2479
/code/branches/ois_update/data/levels/templates	7506-7788
/code/branches/overlay/data/levels/templates	2117-2385
/code/branches/particles/data/levels/templates	2829-3085
/code/branches/particles2/data/levels/templates	6050-6106,6109
/code/branches/pch/data/levels/templates	3113-3194
/code/branches/physics/data/levels/templates	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates	2436-2457
/code/branches/pickup/data/levels/templates	8145-8555
/code/branches/pickup2/data/levels/templates	5942-6405
/code/branches/pickup3/data/levels/templates	6418-6523
/code/branches/pickup4/data/levels/templates	6594-6710
/code/branches/pickups/data/levels/templates	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates	2107-2497,2915-3071
/code/branches/png2/data/levels/templates	7262-7263
/code/branches/portals/data/levels/templates	8087-8455
/code/branches/portals2/data/levels/templates	8460-8602
/code/branches/ppspickups1/data/levels/templates	6552-6708
/code/branches/ppspickups2/data/levels/templates	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates	6757-6997
/code/branches/ppspickups4/data/levels/templates	7003-7089
/code/branches/presentation2/data/levels/templates	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates	6913-7162
/code/branches/questsystem/data/levels/templates	1894-2088
/code/branches/questsystem2/data/levels/templates	2107-2259
/code/branches/questsystem5/data/levels/templates	2776-2905
/code/branches/releasetodo/data/levels/templates	7614-7647
/code/branches/resource/data/levels/templates	3327-3366
/code/branches/resource2/data/levels/templates	3372-5694
/code/branches/rocket/data/levels/templates	6523-6950
/code/branches/rocket2/data/levels/templates	6953-6970
/code/branches/script_trigger/data/levels/templates	1295-1953,1955
/code/branches/skybox2/data/levels/templates	6559-6989
/code/branches/sound/data/levels/templates	2829-3010
/code/branches/sound3/data/levels/templates	5941-6102
/code/branches/spaceboundaries/data/levels/templates	8085-8457
/code/branches/spaceboundaries2/data/levels/templates	8460-8613
/code/branches/spacerace/data/levels/templates	8182-8630
/code/branches/steering/data/levels/templates	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates	8100-8563
/code/branches/tutoriallevel/data/levels/templates	7827-8370
/code/branches/tutoriallevel2/data/levels/templates	8370-8452
/code/branches/tutoriallevel3/data/levels/templates	8453-8636
/code/branches/unity_build/data/levels/templates	8440-8716
/code/branches/weapon/data/levels/templates	1925-2094
/code/branches/weapon2/data/levels/templates	2107-2488
/code/branches/weapons/data/levels/templates	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates	2742-2890

code/branches/presentation2012/data/levels/templates/FPS.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/environment3/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/formation/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/hud/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/menue/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/output/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/usability/data/levels/templates/FPS.oxt	merged	eligible
/code/trunk/data/levels/templates/FPS.oxt	merged	eligible
/code/branches/ai/data/levels/templates/FPS.oxt	6592-7033
/code/branches/ai2/data/levels/templates/FPS.oxt	8721-8880
/code/branches/bigships/data/levels/templates/FPS.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/FPS.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/FPS.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/FPS.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/FPS.oxt	1802-1808
/code/branches/chat/data/levels/templates/FPS.oxt	6527-6797
/code/branches/chat2/data/levels/templates/FPS.oxt	6836-6910
/code/branches/console/data/levels/templates/FPS.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/FPS.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/FPS.oxt	7178-7283
/code/branches/core3/data/levels/templates/FPS.oxt	1572-1739
/code/branches/core4/data/levels/templates/FPS.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/FPS.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/FPS.oxt	7537-7686
/code/branches/doc/data/levels/templates/FPS.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/FPS.oxt	8101-8192
/code/branches/dynamicmatch/data/levels/templates/FPS.oxt	6584-7030
/code/branches/fps/data/levels/templates/FPS.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/FPS.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/FPS.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/FPS.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/FPS.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/FPS.oxt	1580
/code/branches/gui/data/levels/templates/FPS.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/FPS.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/FPS.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/FPS.oxt	6000-6023
/code/branches/input/data/levels/templates/FPS.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/FPS.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/FPS.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/FPS.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/FPS.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/FPS.oxt	7903-8175
/code/branches/libraries/data/levels/templates/FPS.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/FPS.oxt	5703-5737
/code/branches/lod/data/levels/templates/FPS.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/FPS.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/FPS.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/FPS.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/FPS.oxt	7502-7738
/code/branches/menu/data/levels/templates/FPS.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/FPS.oxt	2754-2824
/code/branches/netp2/data/levels/templates/FPS.oxt	2835-2988
/code/branches/netp3/data/levels/templates/FPS.oxt	2988-3082
/code/branches/netp6/data/levels/templates/FPS.oxt	3214-3302
/code/branches/network/data/levels/templates/FPS.oxt	2356
/code/branches/network2/data/levels/templates/FPS.oxt	6434-6465
/code/branches/network3/data/levels/templates/FPS.oxt	7196-7344
/code/branches/network4/data/levels/templates/FPS.oxt	7497-7755
/code/branches/network5/data/levels/templates/FPS.oxt	7757-7781
/code/branches/network6/data/levels/templates/FPS.oxt	7823-8315
/code/branches/network64/data/levels/templates/FPS.oxt	2210-2355
/code/branches/notifications/data/levels/templates/FPS.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/FPS.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/FPS.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/FPS.oxt	7506-7788
/code/branches/overlay/data/levels/templates/FPS.oxt	2117-2385
/code/branches/particles/data/levels/templates/FPS.oxt	2829-3085
/code/branches/particles2/data/levels/templates/FPS.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/FPS.oxt	3113-3194
/code/branches/physics/data/levels/templates/FPS.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/FPS.oxt	2436-2457
/code/branches/pickup/data/levels/templates/FPS.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/FPS.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/FPS.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/FPS.oxt	6594-6710
/code/branches/pickups/data/levels/templates/FPS.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/FPS.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/FPS.oxt	7262-7263
/code/branches/portals/data/levels/templates/FPS.oxt	8087-8455
/code/branches/portals2/data/levels/templates/FPS.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/FPS.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/FPS.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/FPS.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/FPS.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/FPS.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/FPS.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/FPS.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/FPS.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/FPS.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/FPS.oxt	7614-7647
/code/branches/resource/data/levels/templates/FPS.oxt	3327-3366
/code/branches/resource2/data/levels/templates/FPS.oxt	3372-5694
/code/branches/rocket/data/levels/templates/FPS.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/FPS.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/FPS.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/FPS.oxt	6559-6989
/code/branches/sound/data/levels/templates/FPS.oxt	2829-3010
/code/branches/sound3/data/levels/templates/FPS.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/FPS.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/FPS.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/FPS.oxt	8182-8630
/code/branches/steering/data/levels/templates/FPS.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/FPS.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/FPS.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/FPS.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/FPS.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/FPS.oxt	8440-8716
/code/branches/weapon/data/levels/templates/FPS.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/FPS.oxt	2107-2488
/code/branches/weapons/data/levels/templates/FPS.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/FPS.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/lodInformation.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/environment3/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/formation/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/hud/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/menue/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/output/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/usability/data/levels/templates/lodInformation.oxt	merged	eligible
/code/trunk/data/levels/templates/lodInformation.oxt	merged	eligible
/code/branches/ai/data/levels/templates/lodInformation.oxt	6592-7033
/code/branches/ai2/data/levels/templates/lodInformation.oxt	8721-8880
/code/branches/bigships/data/levels/templates/lodInformation.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/lodInformation.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/lodInformation.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/lodInformation.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/lodInformation.oxt	1802-1808
/code/branches/chat/data/levels/templates/lodInformation.oxt	6527-6797
/code/branches/chat2/data/levels/templates/lodInformation.oxt	6836-6910
/code/branches/console/data/levels/templates/lodInformation.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/lodInformation.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/lodInformation.oxt	7178-7283
/code/branches/core3/data/levels/templates/lodInformation.oxt	1572-1739
/code/branches/core4/data/levels/templates/lodInformation.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/lodInformation.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/lodInformation.oxt	7537-7686
/code/branches/doc/data/levels/templates/lodInformation.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/lodInformation.oxt	8101-8192
/code/branches/dynamicmatch/data/levels/templates/lodInformation.oxt	6584-7030
/code/branches/fps/data/levels/templates/lodInformation.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/lodInformation.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/lodInformation.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/lodInformation.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/lodInformation.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/lodInformation.oxt	1580
/code/branches/gui/data/levels/templates/lodInformation.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/lodInformation.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/lodInformation.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/lodInformation.oxt	6000-6023
/code/branches/input/data/levels/templates/lodInformation.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/lodInformation.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/lodInformation.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/lodInformation.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/lodInformation.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/lodInformation.oxt	7903-8175
/code/branches/libraries/data/levels/templates/lodInformation.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/lodInformation.oxt	5703-5737
/code/branches/lod/data/levels/templates/lodInformation.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/lodInformation.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/lodInformation.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/lodInformation.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/lodInformation.oxt	7502-7738
/code/branches/menu/data/levels/templates/lodInformation.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/lodInformation.oxt	2754-2824
/code/branches/netp2/data/levels/templates/lodInformation.oxt	2835-2988
/code/branches/netp3/data/levels/templates/lodInformation.oxt	2988-3082
/code/branches/netp6/data/levels/templates/lodInformation.oxt	3214-3302
/code/branches/network/data/levels/templates/lodInformation.oxt	2356
/code/branches/network2/data/levels/templates/lodInformation.oxt	6434-6465
/code/branches/network3/data/levels/templates/lodInformation.oxt	7196-7344
/code/branches/network4/data/levels/templates/lodInformation.oxt	7497-7755
/code/branches/network5/data/levels/templates/lodInformation.oxt	7757-7781
/code/branches/network6/data/levels/templates/lodInformation.oxt	7823-8315
/code/branches/network64/data/levels/templates/lodInformation.oxt	2210-2355
/code/branches/notifications/data/levels/templates/lodInformation.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/lodInformation.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/lodInformation.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/lodInformation.oxt	7506-7788
/code/branches/overlay/data/levels/templates/lodInformation.oxt	2117-2385
/code/branches/particles/data/levels/templates/lodInformation.oxt	2829-3085
/code/branches/particles2/data/levels/templates/lodInformation.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/lodInformation.oxt	3113-3194
/code/branches/physics/data/levels/templates/lodInformation.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/lodInformation.oxt	2436-2457
/code/branches/pickup/data/levels/templates/lodInformation.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/lodInformation.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/lodInformation.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/lodInformation.oxt	6594-6710
/code/branches/pickups/data/levels/templates/lodInformation.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/lodInformation.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/lodInformation.oxt	7262-7263
/code/branches/portals/data/levels/templates/lodInformation.oxt	8087-8455
/code/branches/portals2/data/levels/templates/lodInformation.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/lodInformation.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/lodInformation.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/lodInformation.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/lodInformation.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/lodInformation.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/lodInformation.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/lodInformation.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/lodInformation.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/lodInformation.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/lodInformation.oxt	7614-7647
/code/branches/resource/data/levels/templates/lodInformation.oxt	3327-3366
/code/branches/resource2/data/levels/templates/lodInformation.oxt	3372-5694
/code/branches/rocket/data/levels/templates/lodInformation.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/lodInformation.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/lodInformation.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/lodInformation.oxt	6559-6989
/code/branches/sound/data/levels/templates/lodInformation.oxt	2829-3010
/code/branches/sound3/data/levels/templates/lodInformation.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/lodInformation.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/lodInformation.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/lodInformation.oxt	8182-8630
/code/branches/steering/data/levels/templates/lodInformation.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/lodInformation.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/lodInformation.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/lodInformation.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/lodInformation.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/lodInformation.oxt	8440-8716
/code/branches/weapon/data/levels/templates/lodInformation.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/lodInformation.oxt	2107-2488
/code/branches/weapons/data/levels/templates/lodInformation.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/lodInformation.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/pickupRepresentationTemplates.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/environment3/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/formation/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/hud/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/menue/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/output/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/usability/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt	merged	eligible
/code/branches/ai/data/levels/templates/pickupRepresentationTemplates.oxt	6592-7033
/code/branches/ai2/data/levels/templates/pickupRepresentationTemplates.oxt	8721-8880
/code/branches/bigships/data/levels/templates/pickupRepresentationTemplates.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/pickupRepresentationTemplates.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/pickupRepresentationTemplates.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/pickupRepresentationTemplates.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/pickupRepresentationTemplates.oxt	1802-1808
/code/branches/chat/data/levels/templates/pickupRepresentationTemplates.oxt	6527-6797
/code/branches/chat2/data/levels/templates/pickupRepresentationTemplates.oxt	6836-6910
/code/branches/console/data/levels/templates/pickupRepresentationTemplates.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/pickupRepresentationTemplates.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/pickupRepresentationTemplates.oxt	7178-7283
/code/branches/core3/data/levels/templates/pickupRepresentationTemplates.oxt	1572-1739
/code/branches/core4/data/levels/templates/pickupRepresentationTemplates.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/pickupRepresentationTemplates.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/pickupRepresentationTemplates.oxt	7537-7686
/code/branches/doc/data/levels/templates/pickupRepresentationTemplates.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/pickupRepresentationTemplates.oxt	8101-8192
/code/branches/dynamicmatch/data/levels/templates/pickupRepresentationTemplates.oxt	6584-7030
/code/branches/fps/data/levels/templates/pickupRepresentationTemplates.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/pickupRepresentationTemplates.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/pickupRepresentationTemplates.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/pickupRepresentationTemplates.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/pickupRepresentationTemplates.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/pickupRepresentationTemplates.oxt	1580
/code/branches/gui/data/levels/templates/pickupRepresentationTemplates.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/pickupRepresentationTemplates.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/pickupRepresentationTemplates.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/pickupRepresentationTemplates.oxt	6000-6023
/code/branches/input/data/levels/templates/pickupRepresentationTemplates.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/pickupRepresentationTemplates.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/pickupRepresentationTemplates.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/pickupRepresentationTemplates.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/pickupRepresentationTemplates.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/pickupRepresentationTemplates.oxt	7903-8175
/code/branches/libraries/data/levels/templates/pickupRepresentationTemplates.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/pickupRepresentationTemplates.oxt	5703-5737
/code/branches/lod/data/levels/templates/pickupRepresentationTemplates.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/pickupRepresentationTemplates.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/pickupRepresentationTemplates.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/pickupRepresentationTemplates.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/pickupRepresentationTemplates.oxt	7502-7738
/code/branches/menu/data/levels/templates/pickupRepresentationTemplates.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/pickupRepresentationTemplates.oxt	2754-2824
/code/branches/netp2/data/levels/templates/pickupRepresentationTemplates.oxt	2835-2988
/code/branches/netp3/data/levels/templates/pickupRepresentationTemplates.oxt	2988-3082
/code/branches/netp6/data/levels/templates/pickupRepresentationTemplates.oxt	3214-3302
/code/branches/network/data/levels/templates/pickupRepresentationTemplates.oxt	2356
/code/branches/network2/data/levels/templates/pickupRepresentationTemplates.oxt	6434-6465
/code/branches/network3/data/levels/templates/pickupRepresentationTemplates.oxt	7196-7344
/code/branches/network4/data/levels/templates/pickupRepresentationTemplates.oxt	7497-7755
/code/branches/network5/data/levels/templates/pickupRepresentationTemplates.oxt	7757-7781
/code/branches/network6/data/levels/templates/pickupRepresentationTemplates.oxt	7823-8315
/code/branches/network64/data/levels/templates/pickupRepresentationTemplates.oxt	2210-2355
/code/branches/notifications/data/levels/templates/pickupRepresentationTemplates.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/pickupRepresentationTemplates.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/pickupRepresentationTemplates.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/pickupRepresentationTemplates.oxt	7506-7788
/code/branches/overlay/data/levels/templates/pickupRepresentationTemplates.oxt	2117-2385
/code/branches/particles/data/levels/templates/pickupRepresentationTemplates.oxt	2829-3085
/code/branches/particles2/data/levels/templates/pickupRepresentationTemplates.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/pickupRepresentationTemplates.oxt	3113-3194
/code/branches/physics/data/levels/templates/pickupRepresentationTemplates.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/pickupRepresentationTemplates.oxt	2436-2457
/code/branches/pickup/data/levels/templates/pickupRepresentationTemplates.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/pickupRepresentationTemplates.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/pickupRepresentationTemplates.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/pickupRepresentationTemplates.oxt	6594-6710
/code/branches/pickups/data/levels/templates/pickupRepresentationTemplates.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/pickupRepresentationTemplates.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/pickupRepresentationTemplates.oxt	7262-7263
/code/branches/portals/data/levels/templates/pickupRepresentationTemplates.oxt	8087-8455
/code/branches/portals2/data/levels/templates/pickupRepresentationTemplates.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/pickupRepresentationTemplates.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/pickupRepresentationTemplates.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/pickupRepresentationTemplates.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/pickupRepresentationTemplates.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/pickupRepresentationTemplates.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/pickupRepresentationTemplates.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/pickupRepresentationTemplates.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/pickupRepresentationTemplates.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/pickupRepresentationTemplates.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/pickupRepresentationTemplates.oxt	7614-7647
/code/branches/resource/data/levels/templates/pickupRepresentationTemplates.oxt	3327-3366
/code/branches/resource2/data/levels/templates/pickupRepresentationTemplates.oxt	3372-5694
/code/branches/rocket/data/levels/templates/pickupRepresentationTemplates.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/pickupRepresentationTemplates.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/pickupRepresentationTemplates.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/pickupRepresentationTemplates.oxt	6559-6989
/code/branches/sound/data/levels/templates/pickupRepresentationTemplates.oxt	2829-3010
/code/branches/sound3/data/levels/templates/pickupRepresentationTemplates.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/pickupRepresentationTemplates.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/pickupRepresentationTemplates.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/pickupRepresentationTemplates.oxt	8182-8630
/code/branches/steering/data/levels/templates/pickupRepresentationTemplates.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/pickupRepresentationTemplates.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/pickupRepresentationTemplates.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/pickupRepresentationTemplates.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/pickupRepresentationTemplates.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/pickupRepresentationTemplates.oxt	8440-8716
/code/branches/weapon/data/levels/templates/pickupRepresentationTemplates.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/pickupRepresentationTemplates.oxt	2107-2488
/code/branches/weapons/data/levels/templates/pickupRepresentationTemplates.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/pickupRepresentationTemplates.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/spaceshipAssff.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/environment3/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/formation/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/hud/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/menue/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/output/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/usability/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/trunk/data/levels/templates/spaceshipAssff.oxt	merged	eligible
/code/branches/ai/data/levels/templates/spaceshipAssff.oxt	6592-7033
/code/branches/ai2/data/levels/templates/spaceshipAssff.oxt	8721-8880
/code/branches/bigships/data/levels/templates/spaceshipAssff.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/spaceshipAssff.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/spaceshipAssff.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/spaceshipAssff.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/spaceshipAssff.oxt	1802-1808
/code/branches/chat/data/levels/templates/spaceshipAssff.oxt	6527-6797
/code/branches/chat2/data/levels/templates/spaceshipAssff.oxt	6836-6910
/code/branches/console/data/levels/templates/spaceshipAssff.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/spaceshipAssff.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/spaceshipAssff.oxt	7178-7283
/code/branches/core3/data/levels/templates/spaceshipAssff.oxt	1572-1739
/code/branches/core4/data/levels/templates/spaceshipAssff.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/spaceshipAssff.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/spaceshipAssff.oxt	7537-7686
/code/branches/doc/data/levels/templates/spaceshipAssff.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/spaceshipAssff.oxt	8101-8192
/code/branches/dynamicmatch/data/levels/templates/spaceshipAssff.oxt	6584-7030
/code/branches/fps/data/levels/templates/spaceshipAssff.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/spaceshipAssff.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/spaceshipAssff.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/spaceshipAssff.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/spaceshipAssff.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/spaceshipAssff.oxt	1580
/code/branches/gui/data/levels/templates/spaceshipAssff.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/spaceshipAssff.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/spaceshipAssff.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/spaceshipAssff.oxt	6000-6023
/code/branches/input/data/levels/templates/spaceshipAssff.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/spaceshipAssff.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/spaceshipAssff.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/spaceshipAssff.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/spaceshipAssff.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/spaceshipAssff.oxt	7903-8175
/code/branches/libraries/data/levels/templates/spaceshipAssff.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/spaceshipAssff.oxt	5703-5737
/code/branches/lod/data/levels/templates/spaceshipAssff.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/spaceshipAssff.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/spaceshipAssff.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/spaceshipAssff.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/spaceshipAssff.oxt	7502-7738
/code/branches/menu/data/levels/templates/spaceshipAssff.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/spaceshipAssff.oxt	2754-2824
/code/branches/netp2/data/levels/templates/spaceshipAssff.oxt	2835-2988
/code/branches/netp3/data/levels/templates/spaceshipAssff.oxt	2988-3082
/code/branches/netp6/data/levels/templates/spaceshipAssff.oxt	3214-3302
/code/branches/network/data/levels/templates/spaceshipAssff.oxt	2356
/code/branches/network2/data/levels/templates/spaceshipAssff.oxt	6434-6465
/code/branches/network3/data/levels/templates/spaceshipAssff.oxt	7196-7344
/code/branches/network4/data/levels/templates/spaceshipAssff.oxt	7497-7755
/code/branches/network5/data/levels/templates/spaceshipAssff.oxt	7757-7781
/code/branches/network6/data/levels/templates/spaceshipAssff.oxt	7823-8315
/code/branches/network64/data/levels/templates/spaceshipAssff.oxt	2210-2355
/code/branches/notifications/data/levels/templates/spaceshipAssff.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/spaceshipAssff.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/spaceshipAssff.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/spaceshipAssff.oxt	7506-7788
/code/branches/overlay/data/levels/templates/spaceshipAssff.oxt	2117-2385
/code/branches/particles/data/levels/templates/spaceshipAssff.oxt	2829-3085
/code/branches/particles2/data/levels/templates/spaceshipAssff.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/spaceshipAssff.oxt	3113-3194
/code/branches/physics/data/levels/templates/spaceshipAssff.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/spaceshipAssff.oxt	2436-2457
/code/branches/pickup/data/levels/templates/spaceshipAssff.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/spaceshipAssff.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/spaceshipAssff.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/spaceshipAssff.oxt	6594-6710
/code/branches/pickups/data/levels/templates/spaceshipAssff.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/spaceshipAssff.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/spaceshipAssff.oxt	7262-7263
/code/branches/portals/data/levels/templates/spaceshipAssff.oxt	8087-8455
/code/branches/portals2/data/levels/templates/spaceshipAssff.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/spaceshipAssff.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/spaceshipAssff.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/spaceshipAssff.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/spaceshipAssff.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/spaceshipAssff.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/spaceshipAssff.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/spaceshipAssff.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/spaceshipAssff.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/spaceshipAssff.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/spaceshipAssff.oxt	7614-7647
/code/branches/resource/data/levels/templates/spaceshipAssff.oxt	3327-3366
/code/branches/resource2/data/levels/templates/spaceshipAssff.oxt	3372-5694
/code/branches/rocket/data/levels/templates/spaceshipAssff.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/spaceshipAssff.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/spaceshipAssff.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/spaceshipAssff.oxt	6559-6989
/code/branches/sound/data/levels/templates/spaceshipAssff.oxt	2829-3010
/code/branches/sound3/data/levels/templates/spaceshipAssff.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/spaceshipAssff.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/spaceshipAssff.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/spaceshipAssff.oxt	8182-8630
/code/branches/steering/data/levels/templates/spaceshipAssff.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/spaceshipAssff.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/spaceshipAssff.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/spaceshipAssff.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/spaceshipAssff.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/spaceshipAssff.oxt	8440-8716
/code/branches/weapon/data/levels/templates/spaceshipAssff.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/spaceshipAssff.oxt	2107-2488
/code/branches/weapons/data/levels/templates/spaceshipAssff.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/spaceshipAssff.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/spaceshipAssff2.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/formation/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/hud/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/menue/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/output/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/trunk/data/levels/templates/spaceshipAssff2.oxt	merged	eligible
/code/branches/ai/data/levels/templates/spaceshipAssff2.oxt	6592-7033
/code/branches/ai2/data/levels/templates/spaceshipAssff2.oxt	8721-8880
/code/branches/bigships/data/levels/templates/spaceshipAssff2.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/spaceshipAssff2.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/spaceshipAssff2.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/spaceshipAssff2.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/spaceshipAssff2.oxt	1802-1808
/code/branches/chat/data/levels/templates/spaceshipAssff2.oxt	6527-6797
/code/branches/chat2/data/levels/templates/spaceshipAssff2.oxt	6836-6910
/code/branches/console/data/levels/templates/spaceshipAssff2.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/spaceshipAssff2.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/spaceshipAssff2.oxt	7178-7283
/code/branches/core3/data/levels/templates/spaceshipAssff2.oxt	1572-1739
/code/branches/core4/data/levels/templates/spaceshipAssff2.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/spaceshipAssff2.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/spaceshipAssff2.oxt	7537-7686
/code/branches/doc/data/levels/templates/spaceshipAssff2.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/spaceshipAssff2.oxt	8101-8192
/code/branches/dockingsystem2/data/levels/templates/spaceshipAssff2.oxt	8196-8560
/code/branches/dynamicmatch/data/levels/templates/spaceshipAssff2.oxt	6584-7030
/code/branches/fps/data/levels/templates/spaceshipAssff2.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/spaceshipAssff2.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/spaceshipAssff2.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/spaceshipAssff2.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/spaceshipAssff2.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/spaceshipAssff2.oxt	1580
/code/branches/gui/data/levels/templates/spaceshipAssff2.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/spaceshipAssff2.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/spaceshipAssff2.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/spaceshipAssff2.oxt	6000-6023
/code/branches/input/data/levels/templates/spaceshipAssff2.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/spaceshipAssff2.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/spaceshipAssff2.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/spaceshipAssff2.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/spaceshipAssff2.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/spaceshipAssff2.oxt	7903-8175
/code/branches/libraries/data/levels/templates/spaceshipAssff2.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/spaceshipAssff2.oxt	5703-5737
/code/branches/lod/data/levels/templates/spaceshipAssff2.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/spaceshipAssff2.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/spaceshipAssff2.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/spaceshipAssff2.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/spaceshipAssff2.oxt	7502-7738
/code/branches/menu/data/levels/templates/spaceshipAssff2.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/spaceshipAssff2.oxt	2754-2824
/code/branches/netp2/data/levels/templates/spaceshipAssff2.oxt	2835-2988
/code/branches/netp3/data/levels/templates/spaceshipAssff2.oxt	2988-3082
/code/branches/netp6/data/levels/templates/spaceshipAssff2.oxt	3214-3302
/code/branches/network/data/levels/templates/spaceshipAssff2.oxt	2356
/code/branches/network2/data/levels/templates/spaceshipAssff2.oxt	6434-6465
/code/branches/network3/data/levels/templates/spaceshipAssff2.oxt	7196-7344
/code/branches/network4/data/levels/templates/spaceshipAssff2.oxt	7497-7755
/code/branches/network5/data/levels/templates/spaceshipAssff2.oxt	7757-7781
/code/branches/network6/data/levels/templates/spaceshipAssff2.oxt	7823-8315
/code/branches/network64/data/levels/templates/spaceshipAssff2.oxt	2210-2355
/code/branches/notifications/data/levels/templates/spaceshipAssff2.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/spaceshipAssff2.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/spaceshipAssff2.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/spaceshipAssff2.oxt	7506-7788
/code/branches/overlay/data/levels/templates/spaceshipAssff2.oxt	2117-2385
/code/branches/particles/data/levels/templates/spaceshipAssff2.oxt	2829-3085
/code/branches/particles2/data/levels/templates/spaceshipAssff2.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/spaceshipAssff2.oxt	3113-3194
/code/branches/physics/data/levels/templates/spaceshipAssff2.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/spaceshipAssff2.oxt	2436-2457
/code/branches/pickup/data/levels/templates/spaceshipAssff2.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/spaceshipAssff2.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/spaceshipAssff2.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/spaceshipAssff2.oxt	6594-6710
/code/branches/pickups/data/levels/templates/spaceshipAssff2.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/spaceshipAssff2.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/spaceshipAssff2.oxt	7262-7263
/code/branches/portals/data/levels/templates/spaceshipAssff2.oxt	8087-8455
/code/branches/portals2/data/levels/templates/spaceshipAssff2.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/spaceshipAssff2.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/spaceshipAssff2.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/spaceshipAssff2.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/spaceshipAssff2.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/spaceshipAssff2.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/spaceshipAssff2.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/spaceshipAssff2.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/spaceshipAssff2.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/spaceshipAssff2.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/spaceshipAssff2.oxt	7614-7647
/code/branches/resource/data/levels/templates/spaceshipAssff2.oxt	3327-3366
/code/branches/resource2/data/levels/templates/spaceshipAssff2.oxt	3372-5694
/code/branches/rocket/data/levels/templates/spaceshipAssff2.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/spaceshipAssff2.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/spaceshipAssff2.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/spaceshipAssff2.oxt	6559-6989
/code/branches/sound/data/levels/templates/spaceshipAssff2.oxt	2829-3010
/code/branches/sound3/data/levels/templates/spaceshipAssff2.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/spaceshipAssff2.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/spaceshipAssff2.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/spaceshipAssff2.oxt	8182-8630
/code/branches/steering/data/levels/templates/spaceshipAssff2.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/spaceshipAssff2.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/spaceshipAssff2.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/spaceshipAssff2.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/spaceshipAssff2.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/spaceshipAssff2.oxt	8440-8716
/code/branches/usability/data/levels/templates/spaceshipAssff2.oxt	7915-8078
/code/branches/weapon/data/levels/templates/spaceshipAssff2.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/spaceshipAssff2.oxt	2107-2488
/code/branches/weapons/data/levels/templates/spaceshipAssff2.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/spaceshipAssff2.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/spaceshipGhost.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/environment3/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/formation/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/hud/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/menue/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/output/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/usability/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/trunk/data/levels/templates/spaceshipGhost.oxt	merged	eligible
/code/branches/ai/data/levels/templates/spaceshipGhost.oxt	6592-7033
/code/branches/ai2/data/levels/templates/spaceshipGhost.oxt	8721-8880
/code/branches/bigships/data/levels/templates/spaceshipGhost.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/spaceshipGhost.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/spaceshipGhost.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/spaceshipGhost.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/spaceshipGhost.oxt	1802-1808
/code/branches/chat/data/levels/templates/spaceshipGhost.oxt	6527-6797
/code/branches/chat2/data/levels/templates/spaceshipGhost.oxt	6836-6910
/code/branches/console/data/levels/templates/spaceshipGhost.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/spaceshipGhost.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/spaceshipGhost.oxt	7178-7283
/code/branches/core3/data/levels/templates/spaceshipGhost.oxt	1572-1739
/code/branches/core4/data/levels/templates/spaceshipGhost.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/spaceshipGhost.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/spaceshipGhost.oxt	7537-7686
/code/branches/doc/data/levels/templates/spaceshipGhost.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/spaceshipGhost.oxt	8101-8192
/code/branches/dynamicmatch/data/levels/templates/spaceshipGhost.oxt	6584-7030
/code/branches/fps/data/levels/templates/spaceshipGhost.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/spaceshipGhost.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/spaceshipGhost.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/spaceshipGhost.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/spaceshipGhost.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/spaceshipGhost.oxt	1580
/code/branches/gui/data/levels/templates/spaceshipGhost.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/spaceshipGhost.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/spaceshipGhost.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/spaceshipGhost.oxt	6000-6023
/code/branches/input/data/levels/templates/spaceshipGhost.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/spaceshipGhost.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/spaceshipGhost.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/spaceshipGhost.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/spaceshipGhost.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/spaceshipGhost.oxt	7903-8175
/code/branches/libraries/data/levels/templates/spaceshipGhost.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/spaceshipGhost.oxt	5703-5737
/code/branches/lod/data/levels/templates/spaceshipGhost.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/spaceshipGhost.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/spaceshipGhost.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/spaceshipGhost.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/spaceshipGhost.oxt	7502-7738
/code/branches/menu/data/levels/templates/spaceshipGhost.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/spaceshipGhost.oxt	2754-2824
/code/branches/netp2/data/levels/templates/spaceshipGhost.oxt	2835-2988
/code/branches/netp3/data/levels/templates/spaceshipGhost.oxt	2988-3082
/code/branches/netp6/data/levels/templates/spaceshipGhost.oxt	3214-3302
/code/branches/network/data/levels/templates/spaceshipGhost.oxt	2356
/code/branches/network2/data/levels/templates/spaceshipGhost.oxt	6434-6465
/code/branches/network3/data/levels/templates/spaceshipGhost.oxt	7196-7344
/code/branches/network4/data/levels/templates/spaceshipGhost.oxt	7497-7755
/code/branches/network5/data/levels/templates/spaceshipGhost.oxt	7757-7781
/code/branches/network6/data/levels/templates/spaceshipGhost.oxt	7823-8315
/code/branches/network64/data/levels/templates/spaceshipGhost.oxt	2210-2355
/code/branches/notifications/data/levels/templates/spaceshipGhost.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/spaceshipGhost.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/spaceshipGhost.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/spaceshipGhost.oxt	7506-7788
/code/branches/overlay/data/levels/templates/spaceshipGhost.oxt	2117-2385
/code/branches/particles/data/levels/templates/spaceshipGhost.oxt	2829-3085
/code/branches/particles2/data/levels/templates/spaceshipGhost.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/spaceshipGhost.oxt	3113-3194
/code/branches/physics/data/levels/templates/spaceshipGhost.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/spaceshipGhost.oxt	2436-2457
/code/branches/pickup/data/levels/templates/spaceshipGhost.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/spaceshipGhost.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/spaceshipGhost.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/spaceshipGhost.oxt	6594-6710
/code/branches/pickups/data/levels/templates/spaceshipGhost.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/spaceshipGhost.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/spaceshipGhost.oxt	7262-7263
/code/branches/portals/data/levels/templates/spaceshipGhost.oxt	8087-8455
/code/branches/portals2/data/levels/templates/spaceshipGhost.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/spaceshipGhost.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/spaceshipGhost.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/spaceshipGhost.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/spaceshipGhost.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/spaceshipGhost.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/spaceshipGhost.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/spaceshipGhost.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/spaceshipGhost.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/spaceshipGhost.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/spaceshipGhost.oxt	7614-7647
/code/branches/resource/data/levels/templates/spaceshipGhost.oxt	3327-3366
/code/branches/resource2/data/levels/templates/spaceshipGhost.oxt	3372-5694
/code/branches/rocket/data/levels/templates/spaceshipGhost.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/spaceshipGhost.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/spaceshipGhost.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/spaceshipGhost.oxt	6559-6989
/code/branches/sound/data/levels/templates/spaceshipGhost.oxt	2829-3010
/code/branches/sound3/data/levels/templates/spaceshipGhost.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/spaceshipGhost.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/spaceshipGhost.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/spaceshipGhost.oxt	8182-8630
/code/branches/steering/data/levels/templates/spaceshipGhost.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/spaceshipGhost.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/spaceshipGhost.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/spaceshipGhost.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/spaceshipGhost.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/spaceshipGhost.oxt	8440-8716
/code/branches/weapon/data/levels/templates/spaceshipGhost.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/spaceshipGhost.oxt	2107-2488
/code/branches/weapons/data/levels/templates/spaceshipGhost.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/spaceshipGhost.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/spaceshipH2.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/environment3/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/formation/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/hud/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/menue/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/output/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/usability/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/trunk/data/levels/templates/spaceshipH2.oxt	merged	eligible
/code/branches/ai/data/levels/templates/spaceshipH2.oxt	6592-7033
/code/branches/ai2/data/levels/templates/spaceshipH2.oxt	8721-8880
/code/branches/bigships/data/levels/templates/spaceshipH2.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/spaceshipH2.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/spaceshipH2.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/spaceshipH2.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/spaceshipH2.oxt	1802-1808
/code/branches/chat/data/levels/templates/spaceshipH2.oxt	6527-6797
/code/branches/chat2/data/levels/templates/spaceshipH2.oxt	6836-6910
/code/branches/console/data/levels/templates/spaceshipH2.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/spaceshipH2.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/spaceshipH2.oxt	7178-7283
/code/branches/core3/data/levels/templates/spaceshipH2.oxt	1572-1739
/code/branches/core4/data/levels/templates/spaceshipH2.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/spaceshipH2.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/spaceshipH2.oxt	7537-7686
/code/branches/doc/data/levels/templates/spaceshipH2.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/spaceshipH2.oxt	8101-8192
/code/branches/dynamicmatch/data/levels/templates/spaceshipH2.oxt	6584-7030
/code/branches/fps/data/levels/templates/spaceshipH2.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/spaceshipH2.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/spaceshipH2.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/spaceshipH2.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/spaceshipH2.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/spaceshipH2.oxt	1580
/code/branches/gui/data/levels/templates/spaceshipH2.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/spaceshipH2.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/spaceshipH2.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/spaceshipH2.oxt	6000-6023
/code/branches/input/data/levels/templates/spaceshipH2.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/spaceshipH2.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/spaceshipH2.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/spaceshipH2.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/spaceshipH2.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/spaceshipH2.oxt	7903-8175
/code/branches/libraries/data/levels/templates/spaceshipH2.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/spaceshipH2.oxt	5703-5737
/code/branches/lod/data/levels/templates/spaceshipH2.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/spaceshipH2.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/spaceshipH2.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/spaceshipH2.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/spaceshipH2.oxt	7502-7738
/code/branches/menu/data/levels/templates/spaceshipH2.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/spaceshipH2.oxt	2754-2824
/code/branches/netp2/data/levels/templates/spaceshipH2.oxt	2835-2988
/code/branches/netp3/data/levels/templates/spaceshipH2.oxt	2988-3082
/code/branches/netp6/data/levels/templates/spaceshipH2.oxt	3214-3302
/code/branches/network/data/levels/templates/spaceshipH2.oxt	2356
/code/branches/network2/data/levels/templates/spaceshipH2.oxt	6434-6465
/code/branches/network3/data/levels/templates/spaceshipH2.oxt	7196-7344
/code/branches/network4/data/levels/templates/spaceshipH2.oxt	7497-7755
/code/branches/network5/data/levels/templates/spaceshipH2.oxt	7757-7781
/code/branches/network6/data/levels/templates/spaceshipH2.oxt	7823-8315
/code/branches/network64/data/levels/templates/spaceshipH2.oxt	2210-2355
/code/branches/notifications/data/levels/templates/spaceshipH2.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/spaceshipH2.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/spaceshipH2.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/spaceshipH2.oxt	7506-7788
/code/branches/overlay/data/levels/templates/spaceshipH2.oxt	2117-2385
/code/branches/particles/data/levels/templates/spaceshipH2.oxt	2829-3085
/code/branches/particles2/data/levels/templates/spaceshipH2.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/spaceshipH2.oxt	3113-3194
/code/branches/physics/data/levels/templates/spaceshipH2.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/spaceshipH2.oxt	2436-2457
/code/branches/pickup/data/levels/templates/spaceshipH2.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/spaceshipH2.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/spaceshipH2.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/spaceshipH2.oxt	6594-6710
/code/branches/pickups/data/levels/templates/spaceshipH2.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/spaceshipH2.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/spaceshipH2.oxt	7262-7263
/code/branches/portals/data/levels/templates/spaceshipH2.oxt	8087-8455
/code/branches/portals2/data/levels/templates/spaceshipH2.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/spaceshipH2.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/spaceshipH2.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/spaceshipH2.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/spaceshipH2.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/spaceshipH2.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/spaceshipH2.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/spaceshipH2.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/spaceshipH2.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/spaceshipH2.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/spaceshipH2.oxt	7614-7647
/code/branches/resource/data/levels/templates/spaceshipH2.oxt	3327-3366
/code/branches/resource2/data/levels/templates/spaceshipH2.oxt	3372-5694
/code/branches/rocket/data/levels/templates/spaceshipH2.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/spaceshipH2.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/spaceshipH2.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/spaceshipH2.oxt	6559-6989
/code/branches/sound/data/levels/templates/spaceshipH2.oxt	2829-3010
/code/branches/sound3/data/levels/templates/spaceshipH2.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/spaceshipH2.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/spaceshipH2.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/spaceshipH2.oxt	8182-8630
/code/branches/steering/data/levels/templates/spaceshipH2.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/spaceshipH2.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/spaceshipH2.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/spaceshipH2.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/spaceshipH2.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/spaceshipH2.oxt	8440-8716
/code/branches/weapon/data/levels/templates/spaceshipH2.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/spaceshipH2.oxt	2107-2488
/code/branches/weapons/data/levels/templates/spaceshipH2.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/spaceshipH2.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/spaceshipHXY.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/environment3/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/formation/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/hud/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/menue/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/output/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/usability/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/trunk/data/levels/templates/spaceshipHXY.oxt	merged	eligible
/code/branches/ai/data/levels/templates/spaceshipHXY.oxt	6592-7033
/code/branches/ai2/data/levels/templates/spaceshipHXY.oxt	8721-8880
/code/branches/bigships/data/levels/templates/spaceshipHXY.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/spaceshipHXY.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/spaceshipHXY.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/spaceshipHXY.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/spaceshipHXY.oxt	1802-1808
/code/branches/chat/data/levels/templates/spaceshipHXY.oxt	6527-6797
/code/branches/chat2/data/levels/templates/spaceshipHXY.oxt	6836-6910
/code/branches/console/data/levels/templates/spaceshipHXY.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/spaceshipHXY.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/spaceshipHXY.oxt	7178-7283
/code/branches/core3/data/levels/templates/spaceshipHXY.oxt	1572-1739
/code/branches/core4/data/levels/templates/spaceshipHXY.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/spaceshipHXY.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/spaceshipHXY.oxt	7537-7686
/code/branches/doc/data/levels/templates/spaceshipHXY.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/spaceshipHXY.oxt	8101-8192
/code/branches/dynamicmatch/data/levels/templates/spaceshipHXY.oxt	6584-7030
/code/branches/fps/data/levels/templates/spaceshipHXY.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/spaceshipHXY.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/spaceshipHXY.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/spaceshipHXY.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/spaceshipHXY.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/spaceshipHXY.oxt	1580
/code/branches/gui/data/levels/templates/spaceshipHXY.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/spaceshipHXY.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/spaceshipHXY.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/spaceshipHXY.oxt	6000-6023
/code/branches/input/data/levels/templates/spaceshipHXY.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/spaceshipHXY.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/spaceshipHXY.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/spaceshipHXY.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/spaceshipHXY.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/spaceshipHXY.oxt	7903-8175
/code/branches/libraries/data/levels/templates/spaceshipHXY.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/spaceshipHXY.oxt	5703-5737
/code/branches/lod/data/levels/templates/spaceshipHXY.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/spaceshipHXY.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/spaceshipHXY.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/spaceshipHXY.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/spaceshipHXY.oxt	7502-7738
/code/branches/menu/data/levels/templates/spaceshipHXY.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/spaceshipHXY.oxt	2754-2824
/code/branches/netp2/data/levels/templates/spaceshipHXY.oxt	2835-2988
/code/branches/netp3/data/levels/templates/spaceshipHXY.oxt	2988-3082
/code/branches/netp6/data/levels/templates/spaceshipHXY.oxt	3214-3302
/code/branches/network/data/levels/templates/spaceshipHXY.oxt	2356
/code/branches/network2/data/levels/templates/spaceshipHXY.oxt	6434-6465
/code/branches/network3/data/levels/templates/spaceshipHXY.oxt	7196-7344
/code/branches/network4/data/levels/templates/spaceshipHXY.oxt	7497-7755
/code/branches/network5/data/levels/templates/spaceshipHXY.oxt	7757-7781
/code/branches/network6/data/levels/templates/spaceshipHXY.oxt	7823-8315
/code/branches/network64/data/levels/templates/spaceshipHXY.oxt	2210-2355
/code/branches/notifications/data/levels/templates/spaceshipHXY.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/spaceshipHXY.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/spaceshipHXY.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/spaceshipHXY.oxt	7506-7788
/code/branches/overlay/data/levels/templates/spaceshipHXY.oxt	2117-2385
/code/branches/particles/data/levels/templates/spaceshipHXY.oxt	2829-3085
/code/branches/particles2/data/levels/templates/spaceshipHXY.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/spaceshipHXY.oxt	3113-3194
/code/branches/physics/data/levels/templates/spaceshipHXY.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/spaceshipHXY.oxt	2436-2457
/code/branches/pickup/data/levels/templates/spaceshipHXY.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/spaceshipHXY.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/spaceshipHXY.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/spaceshipHXY.oxt	6594-6710
/code/branches/pickups/data/levels/templates/spaceshipHXY.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/spaceshipHXY.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/spaceshipHXY.oxt	7262-7263
/code/branches/portals/data/levels/templates/spaceshipHXY.oxt	8087-8455
/code/branches/portals2/data/levels/templates/spaceshipHXY.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/spaceshipHXY.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/spaceshipHXY.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/spaceshipHXY.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/spaceshipHXY.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/spaceshipHXY.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/spaceshipHXY.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/spaceshipHXY.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/spaceshipHXY.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/spaceshipHXY.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/spaceshipHXY.oxt	7614-7647
/code/branches/resource/data/levels/templates/spaceshipHXY.oxt	3327-3366
/code/branches/resource2/data/levels/templates/spaceshipHXY.oxt	3372-5694
/code/branches/rocket/data/levels/templates/spaceshipHXY.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/spaceshipHXY.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/spaceshipHXY.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/spaceshipHXY.oxt	6559-6989
/code/branches/sound/data/levels/templates/spaceshipHXY.oxt	2829-3010
/code/branches/sound3/data/levels/templates/spaceshipHXY.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/spaceshipHXY.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/spaceshipHXY.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/spaceshipHXY.oxt	8182-8630
/code/branches/steering/data/levels/templates/spaceshipHXY.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/spaceshipHXY.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/spaceshipHXY.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/spaceshipHXY.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/spaceshipHXY.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/spaceshipHXY.oxt	8440-8716
/code/branches/weapon/data/levels/templates/spaceshipHXY.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/spaceshipHXY.oxt	2107-2488
/code/branches/weapons/data/levels/templates/spaceshipHXY.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/spaceshipHXY.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/spaceshipHXYSL.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/environment3/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/formation/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/hud/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/menue/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/output/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/usability/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/trunk/data/levels/templates/spaceshipHXYSL.oxt	merged	eligible
/code/branches/ai/data/levels/templates/spaceshipHXYSL.oxt	6592-7033
/code/branches/ai2/data/levels/templates/spaceshipHXYSL.oxt	8721-8880
/code/branches/bigships/data/levels/templates/spaceshipHXYSL.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/spaceshipHXYSL.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/spaceshipHXYSL.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/spaceshipHXYSL.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/spaceshipHXYSL.oxt	1802-1808
/code/branches/chat/data/levels/templates/spaceshipHXYSL.oxt	6527-6797
/code/branches/chat2/data/levels/templates/spaceshipHXYSL.oxt	6836-6910
/code/branches/console/data/levels/templates/spaceshipHXYSL.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/spaceshipHXYSL.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/spaceshipHXYSL.oxt	7178-7283
/code/branches/core3/data/levels/templates/spaceshipHXYSL.oxt	1572-1739
/code/branches/core4/data/levels/templates/spaceshipHXYSL.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/spaceshipHXYSL.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/spaceshipHXYSL.oxt	7537-7686
/code/branches/doc/data/levels/templates/spaceshipHXYSL.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/spaceshipHXYSL.oxt	8101-8192
/code/branches/dynamicmatch/data/levels/templates/spaceshipHXYSL.oxt	6584-7030
/code/branches/fps/data/levels/templates/spaceshipHXYSL.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/spaceshipHXYSL.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/spaceshipHXYSL.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/spaceshipHXYSL.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/spaceshipHXYSL.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/spaceshipHXYSL.oxt	1580
/code/branches/gui/data/levels/templates/spaceshipHXYSL.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/spaceshipHXYSL.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/spaceshipHXYSL.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/spaceshipHXYSL.oxt	6000-6023
/code/branches/input/data/levels/templates/spaceshipHXYSL.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/spaceshipHXYSL.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/spaceshipHXYSL.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/spaceshipHXYSL.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/spaceshipHXYSL.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/spaceshipHXYSL.oxt	7903-8175
/code/branches/libraries/data/levels/templates/spaceshipHXYSL.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/spaceshipHXYSL.oxt	5703-5737
/code/branches/lod/data/levels/templates/spaceshipHXYSL.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/spaceshipHXYSL.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/spaceshipHXYSL.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/spaceshipHXYSL.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/spaceshipHXYSL.oxt	7502-7738
/code/branches/menu/data/levels/templates/spaceshipHXYSL.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/spaceshipHXYSL.oxt	2754-2824
/code/branches/netp2/data/levels/templates/spaceshipHXYSL.oxt	2835-2988
/code/branches/netp3/data/levels/templates/spaceshipHXYSL.oxt	2988-3082
/code/branches/netp6/data/levels/templates/spaceshipHXYSL.oxt	3214-3302
/code/branches/network/data/levels/templates/spaceshipHXYSL.oxt	2356
/code/branches/network2/data/levels/templates/spaceshipHXYSL.oxt	6434-6465
/code/branches/network3/data/levels/templates/spaceshipHXYSL.oxt	7196-7344
/code/branches/network4/data/levels/templates/spaceshipHXYSL.oxt	7497-7755
/code/branches/network5/data/levels/templates/spaceshipHXYSL.oxt	7757-7781
/code/branches/network6/data/levels/templates/spaceshipHXYSL.oxt	7823-8315
/code/branches/network64/data/levels/templates/spaceshipHXYSL.oxt	2210-2355
/code/branches/notifications/data/levels/templates/spaceshipHXYSL.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/spaceshipHXYSL.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/spaceshipHXYSL.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/spaceshipHXYSL.oxt	7506-7788
/code/branches/overlay/data/levels/templates/spaceshipHXYSL.oxt	2117-2385
/code/branches/particles/data/levels/templates/spaceshipHXYSL.oxt	2829-3085
/code/branches/particles2/data/levels/templates/spaceshipHXYSL.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/spaceshipHXYSL.oxt	3113-3194
/code/branches/physics/data/levels/templates/spaceshipHXYSL.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/spaceshipHXYSL.oxt	2436-2457
/code/branches/pickup/data/levels/templates/spaceshipHXYSL.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/spaceshipHXYSL.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/spaceshipHXYSL.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/spaceshipHXYSL.oxt	6594-6710
/code/branches/pickups/data/levels/templates/spaceshipHXYSL.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/spaceshipHXYSL.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/spaceshipHXYSL.oxt	7262-7263
/code/branches/portals/data/levels/templates/spaceshipHXYSL.oxt	8087-8455
/code/branches/portals2/data/levels/templates/spaceshipHXYSL.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/spaceshipHXYSL.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/spaceshipHXYSL.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/spaceshipHXYSL.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/spaceshipHXYSL.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/spaceshipHXYSL.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/spaceshipHXYSL.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/spaceshipHXYSL.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/spaceshipHXYSL.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/spaceshipHXYSL.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/spaceshipHXYSL.oxt	7614-7647
/code/branches/resource/data/levels/templates/spaceshipHXYSL.oxt	3327-3366
/code/branches/resource2/data/levels/templates/spaceshipHXYSL.oxt	3372-5694
/code/branches/rocket/data/levels/templates/spaceshipHXYSL.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/spaceshipHXYSL.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/spaceshipHXYSL.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/spaceshipHXYSL.oxt	6559-6989
/code/branches/sound/data/levels/templates/spaceshipHXYSL.oxt	2829-3010
/code/branches/sound3/data/levels/templates/spaceshipHXYSL.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/spaceshipHXYSL.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/spaceshipHXYSL.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/spaceshipHXYSL.oxt	8182-8630
/code/branches/steering/data/levels/templates/spaceshipHXYSL.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/spaceshipHXYSL.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/spaceshipHXYSL.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/spaceshipHXYSL.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/spaceshipHXYSL.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/spaceshipHXYSL.oxt	8440-8716
/code/branches/weapon/data/levels/templates/spaceshipHXYSL.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/spaceshipHXYSL.oxt	2107-2488
/code/branches/weapons/data/levels/templates/spaceshipHXYSL.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/spaceshipHXYSL.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/spaceshipPirate.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/environment3/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/formation/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/hud/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/menue/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/output/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/usability/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/trunk/data/levels/templates/spaceshipPirate.oxt	merged	eligible
/code/branches/ai/data/levels/templates/spaceshipPirate.oxt	6592-7033
/code/branches/ai2/data/levels/templates/spaceshipPirate.oxt	8721-8880
/code/branches/bigships/data/levels/templates/spaceshipPirate.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/spaceshipPirate.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/spaceshipPirate.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/spaceshipPirate.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/spaceshipPirate.oxt	1802-1808
/code/branches/chat/data/levels/templates/spaceshipPirate.oxt	6527-6797
/code/branches/chat2/data/levels/templates/spaceshipPirate.oxt	6836-6910
/code/branches/console/data/levels/templates/spaceshipPirate.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/spaceshipPirate.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/spaceshipPirate.oxt	7178-7283
/code/branches/core3/data/levels/templates/spaceshipPirate.oxt	1572-1739
/code/branches/core4/data/levels/templates/spaceshipPirate.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/spaceshipPirate.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/spaceshipPirate.oxt	7537-7686
/code/branches/doc/data/levels/templates/spaceshipPirate.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/spaceshipPirate.oxt	8101-8192
/code/branches/dynamicmatch/data/levels/templates/spaceshipPirate.oxt	6584-7030
/code/branches/fps/data/levels/templates/spaceshipPirate.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/spaceshipPirate.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/spaceshipPirate.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/spaceshipPirate.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/spaceshipPirate.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/spaceshipPirate.oxt	1580
/code/branches/gui/data/levels/templates/spaceshipPirate.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/spaceshipPirate.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/spaceshipPirate.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/spaceshipPirate.oxt	6000-6023
/code/branches/input/data/levels/templates/spaceshipPirate.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/spaceshipPirate.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/spaceshipPirate.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/spaceshipPirate.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/spaceshipPirate.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/spaceshipPirate.oxt	7903-8175
/code/branches/libraries/data/levels/templates/spaceshipPirate.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/spaceshipPirate.oxt	5703-5737
/code/branches/lod/data/levels/templates/spaceshipPirate.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/spaceshipPirate.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/spaceshipPirate.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/spaceshipPirate.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/spaceshipPirate.oxt	7502-7738
/code/branches/menu/data/levels/templates/spaceshipPirate.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/spaceshipPirate.oxt	2754-2824
/code/branches/netp2/data/levels/templates/spaceshipPirate.oxt	2835-2988
/code/branches/netp3/data/levels/templates/spaceshipPirate.oxt	2988-3082
/code/branches/netp6/data/levels/templates/spaceshipPirate.oxt	3214-3302
/code/branches/network/data/levels/templates/spaceshipPirate.oxt	2356
/code/branches/network2/data/levels/templates/spaceshipPirate.oxt	6434-6465
/code/branches/network3/data/levels/templates/spaceshipPirate.oxt	7196-7344
/code/branches/network4/data/levels/templates/spaceshipPirate.oxt	7497-7755
/code/branches/network5/data/levels/templates/spaceshipPirate.oxt	7757-7781
/code/branches/network6/data/levels/templates/spaceshipPirate.oxt	7823-8315
/code/branches/network64/data/levels/templates/spaceshipPirate.oxt	2210-2355
/code/branches/notifications/data/levels/templates/spaceshipPirate.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/spaceshipPirate.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/spaceshipPirate.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/spaceshipPirate.oxt	7506-7788
/code/branches/overlay/data/levels/templates/spaceshipPirate.oxt	2117-2385
/code/branches/particles/data/levels/templates/spaceshipPirate.oxt	2829-3085
/code/branches/particles2/data/levels/templates/spaceshipPirate.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/spaceshipPirate.oxt	3113-3194
/code/branches/physics/data/levels/templates/spaceshipPirate.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/spaceshipPirate.oxt	2436-2457
/code/branches/pickup/data/levels/templates/spaceshipPirate.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/spaceshipPirate.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/spaceshipPirate.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/spaceshipPirate.oxt	6594-6710
/code/branches/pickups/data/levels/templates/spaceshipPirate.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/spaceshipPirate.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/spaceshipPirate.oxt	7262-7263
/code/branches/portals/data/levels/templates/spaceshipPirate.oxt	8087-8455
/code/branches/portals2/data/levels/templates/spaceshipPirate.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/spaceshipPirate.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/spaceshipPirate.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/spaceshipPirate.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/spaceshipPirate.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/spaceshipPirate.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/spaceshipPirate.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/spaceshipPirate.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/spaceshipPirate.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/spaceshipPirate.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/spaceshipPirate.oxt	7614-7647
/code/branches/resource/data/levels/templates/spaceshipPirate.oxt	3327-3366
/code/branches/resource2/data/levels/templates/spaceshipPirate.oxt	3372-5694
/code/branches/rocket/data/levels/templates/spaceshipPirate.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/spaceshipPirate.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/spaceshipPirate.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/spaceshipPirate.oxt	6559-6989
/code/branches/sound/data/levels/templates/spaceshipPirate.oxt	2829-3010
/code/branches/sound3/data/levels/templates/spaceshipPirate.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/spaceshipPirate.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/spaceshipPirate.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/spaceshipPirate.oxt	8182-8630
/code/branches/steering/data/levels/templates/spaceshipPirate.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/spaceshipPirate.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/spaceshipPirate.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/spaceshipPirate.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/spaceshipPirate.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/spaceshipPirate.oxt	8440-8716
/code/branches/weapon/data/levels/templates/spaceshipPirate.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/spaceshipPirate.oxt	2107-2488
/code/branches/weapons/data/levels/templates/spaceshipPirate.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/spaceshipPirate.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/spaceshipRace.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/surfaceRace/data/levels/templates/spaceshipRace.oxt	merged	eligible
/code/branches/ai/data/levels/templates/spaceshipRace.oxt	6592-7033
/code/branches/ai2/data/levels/templates/spaceshipRace.oxt	8721-8880
/code/branches/bigships/data/levels/templates/spaceshipRace.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/spaceshipRace.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/spaceshipRace.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/spaceshipRace.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/spaceshipRace.oxt	1802-1808
/code/branches/chat/data/levels/templates/spaceshipRace.oxt	6527-6797
/code/branches/chat2/data/levels/templates/spaceshipRace.oxt	6836-6910
/code/branches/console/data/levels/templates/spaceshipRace.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/spaceshipRace.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/spaceshipRace.oxt	7178-7283
/code/branches/core3/data/levels/templates/spaceshipRace.oxt	1572-1739
/code/branches/core4/data/levels/templates/spaceshipRace.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/spaceshipRace.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/spaceshipRace.oxt	7537-7686
/code/branches/doc/data/levels/templates/spaceshipRace.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/spaceshipRace.oxt	8101-8192
/code/branches/dockingsystem2/data/levels/templates/spaceshipRace.oxt	8196-8560
/code/branches/dynamicmatch/data/levels/templates/spaceshipRace.oxt	6584-7030
/code/branches/environment3/data/levels/templates/spaceshipRace.oxt	8887-8975
/code/branches/formation/data/levels/templates/spaceshipRace.oxt	8885-8991
/code/branches/fps/data/levels/templates/spaceshipRace.oxt	6591-7072
/code/branches/gamecontent/data/levels/templates/spaceshipRace.oxt	8893-8968
/code/branches/gameimmersion/data/levels/templates/spaceshipRace.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/spaceshipRace.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/spaceshipRace.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/spaceshipRace.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/spaceshipRace.oxt	1580
/code/branches/gui/data/levels/templates/spaceshipRace.oxt	1635-1723,2795-2894
/code/branches/hud/data/levels/templates/spaceshipRace.oxt	8883-8986
/code/branches/hudelements/data/levels/templates/spaceshipRace.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/spaceshipRace.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/spaceshipRace.oxt	6000-6023
/code/branches/input/data/levels/templates/spaceshipRace.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/spaceshipRace.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/spaceshipRace.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/spaceshipRace.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/spaceshipRace.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/spaceshipRace.oxt	7903-8175
/code/branches/libraries/data/levels/templates/spaceshipRace.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/spaceshipRace.oxt	5703-5737
/code/branches/lod/data/levels/templates/spaceshipRace.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/spaceshipRace.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/spaceshipRace.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/spaceshipRace.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/spaceshipRace.oxt	7502-7738
/code/branches/masterserverfix/data/levels/templates/spaceshipRace.oxt	8933-8936
/code/branches/menu/data/levels/templates/spaceshipRace.oxt	5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/spaceshipRace.oxt	8884-8976
/code/branches/miniprojects/data/levels/templates/spaceshipRace.oxt	2754-2824
/code/branches/netp2/data/levels/templates/spaceshipRace.oxt	2835-2988
/code/branches/netp3/data/levels/templates/spaceshipRace.oxt	2988-3082
/code/branches/netp6/data/levels/templates/spaceshipRace.oxt	3214-3302
/code/branches/network/data/levels/templates/spaceshipRace.oxt	2356
/code/branches/network2/data/levels/templates/spaceshipRace.oxt	6434-6465
/code/branches/network3/data/levels/templates/spaceshipRace.oxt	7196-7344
/code/branches/network4/data/levels/templates/spaceshipRace.oxt	7497-7755
/code/branches/network5/data/levels/templates/spaceshipRace.oxt	7757-7781
/code/branches/network6/data/levels/templates/spaceshipRace.oxt	7823-8315
/code/branches/network64/data/levels/templates/spaceshipRace.oxt	2210-2355
/code/branches/newlevel2012/data/levels/templates/spaceshipRace.oxt	9033-9240
/code/branches/notifications/data/levels/templates/spaceshipRace.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/spaceshipRace.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/spaceshipRace.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/spaceshipRace.oxt	7506-7788
/code/branches/output/data/levels/templates/spaceshipRace.oxt	8739-8857
/code/branches/overlay/data/levels/templates/spaceshipRace.oxt	2117-2385
/code/branches/particles/data/levels/templates/spaceshipRace.oxt	2829-3085
/code/branches/particles2/data/levels/templates/spaceshipRace.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/spaceshipRace.oxt	3113-3194
/code/branches/physics/data/levels/templates/spaceshipRace.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/spaceshipRace.oxt	2436-2457
/code/branches/pickup/data/levels/templates/spaceshipRace.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/spaceshipRace.oxt	5942-6405
/code/branches/pickup2012/data/levels/templates/spaceshipRace.oxt	9029-9189
/code/branches/pickup3/data/levels/templates/spaceshipRace.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/spaceshipRace.oxt	6594-6710
/code/branches/pickups/data/levels/templates/spaceshipRace.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/spaceshipRace.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/spaceshipRace.oxt	7262-7263
/code/branches/portals/data/levels/templates/spaceshipRace.oxt	8087-8455
/code/branches/portals2/data/levels/templates/spaceshipRace.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/spaceshipRace.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/spaceshipRace.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/spaceshipRace.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/spaceshipRace.oxt	7003-7089
/code/branches/presentation/data/levels/templates/spaceshipRace.oxt	2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/spaceshipRace.oxt	6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/spaceshipRace.oxt	8974-9015
/code/branches/presentation3/data/levels/templates/spaceshipRace.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/spaceshipRace.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/spaceshipRace.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/spaceshipRace.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/spaceshipRace.oxt	7614-7647
/code/branches/resource/data/levels/templates/spaceshipRace.oxt	3327-3366
/code/branches/resource2/data/levels/templates/spaceshipRace.oxt	3372-5694
/code/branches/rocket/data/levels/templates/spaceshipRace.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/spaceshipRace.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/spaceshipRace.oxt	1295-1953,1955
/code/branches/shipSelection/data/levels/templates/spaceshipRace.oxt	9038-9206
/code/branches/skybox2/data/levels/templates/spaceshipRace.oxt	6559-6989
/code/branches/sound/data/levels/templates/spaceshipRace.oxt	2829-3010
/code/branches/sound2012/data/levels/templates/spaceshipRace.oxt	9205-9240
/code/branches/sound3/data/levels/templates/spaceshipRace.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/spaceshipRace.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/spaceshipRace.oxt	8460-8613
/code/branches/spacegate/data/levels/templates/spaceshipRace.oxt	9030-9215
/code/branches/spacerace/data/levels/templates/spaceshipRace.oxt	8182-8630
/code/branches/spaceraceTwo/data/levels/templates/spaceshipRace.oxt	8881-8996
/code/branches/steering/data/levels/templates/spaceshipRace.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/spaceshipRace.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/spaceshipRace.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/spaceshipRace.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/spaceshipRace.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/spaceshipRace.oxt	8440-8716
/code/branches/usability/data/levels/templates/spaceshipRace.oxt	7915-8078
/code/branches/weapon/data/levels/templates/spaceshipRace.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/spaceshipRace.oxt	2107-2488
/code/branches/weapons/data/levels/templates/spaceshipRace.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/spaceshipRace.oxt	2742-2890
/code/trunk/data/levels/templates/spaceshipRace.oxt	9189-9204

code/branches/presentation2012/data/levels/templates/spaceshipSpacecruiser.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/spaceshipSpacecruiser.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/spaceshipSpacecruiser.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/spaceshipSpacecruiser.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/spaceshipSpacecruiser.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/spaceshipSpacecruiser.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/spaceshipSpacecruiser.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/spaceshipSpacecruiser.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/spaceshipSpacecruiser.oxt	merged	eligible
/code/trunk/data/levels/templates/spaceshipSpacecruiser.oxt	merged	eligible
/code/branches/ai/data/levels/templates/spaceshipSpacecruiser.oxt	6592-7033
/code/branches/ai2/data/levels/templates/spaceshipSpacecruiser.oxt	8721-8880
/code/branches/bigships/data/levels/templates/spaceshipSpacecruiser.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/spaceshipSpacecruiser.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/spaceshipSpacecruiser.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/spaceshipSpacecruiser.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/spaceshipSpacecruiser.oxt	1802-1808
/code/branches/chat/data/levels/templates/spaceshipSpacecruiser.oxt	6527-6797
/code/branches/chat2/data/levels/templates/spaceshipSpacecruiser.oxt	6836-6910
/code/branches/console/data/levels/templates/spaceshipSpacecruiser.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/spaceshipSpacecruiser.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/spaceshipSpacecruiser.oxt	7178-7283
/code/branches/core3/data/levels/templates/spaceshipSpacecruiser.oxt	1572-1739
/code/branches/core4/data/levels/templates/spaceshipSpacecruiser.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/spaceshipSpacecruiser.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/spaceshipSpacecruiser.oxt	7537-7686
/code/branches/doc/data/levels/templates/spaceshipSpacecruiser.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/spaceshipSpacecruiser.oxt	8101-8192
/code/branches/dockingsystem2/data/levels/templates/spaceshipSpacecruiser.oxt	8196-8560
/code/branches/dynamicmatch/data/levels/templates/spaceshipSpacecruiser.oxt	6584-7030
/code/branches/environment3/data/levels/templates/spaceshipSpacecruiser.oxt	8887-8975
/code/branches/formation/data/levels/templates/spaceshipSpacecruiser.oxt	8885-8991
/code/branches/fps/data/levels/templates/spaceshipSpacecruiser.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/spaceshipSpacecruiser.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/spaceshipSpacecruiser.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/spaceshipSpacecruiser.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/spaceshipSpacecruiser.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/spaceshipSpacecruiser.oxt	1580
/code/branches/gui/data/levels/templates/spaceshipSpacecruiser.oxt	1635-1723,2795-2894
/code/branches/hud/data/levels/templates/spaceshipSpacecruiser.oxt	8883-8986
/code/branches/hudelements/data/levels/templates/spaceshipSpacecruiser.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/spaceshipSpacecruiser.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/spaceshipSpacecruiser.oxt	6000-6023
/code/branches/input/data/levels/templates/spaceshipSpacecruiser.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/spaceshipSpacecruiser.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/spaceshipSpacecruiser.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/spaceshipSpacecruiser.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/spaceshipSpacecruiser.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/spaceshipSpacecruiser.oxt	7903-8175
/code/branches/libraries/data/levels/templates/spaceshipSpacecruiser.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/spaceshipSpacecruiser.oxt	5703-5737
/code/branches/lod/data/levels/templates/spaceshipSpacecruiser.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/spaceshipSpacecruiser.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/spaceshipSpacecruiser.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/spaceshipSpacecruiser.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/spaceshipSpacecruiser.oxt	7502-7738
/code/branches/menu/data/levels/templates/spaceshipSpacecruiser.oxt	5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/spaceshipSpacecruiser.oxt	8884-8976
/code/branches/miniprojects/data/levels/templates/spaceshipSpacecruiser.oxt	2754-2824
/code/branches/netp2/data/levels/templates/spaceshipSpacecruiser.oxt	2835-2988
/code/branches/netp3/data/levels/templates/spaceshipSpacecruiser.oxt	2988-3082
/code/branches/netp6/data/levels/templates/spaceshipSpacecruiser.oxt	3214-3302
/code/branches/network/data/levels/templates/spaceshipSpacecruiser.oxt	2356
/code/branches/network2/data/levels/templates/spaceshipSpacecruiser.oxt	6434-6465
/code/branches/network3/data/levels/templates/spaceshipSpacecruiser.oxt	7196-7344
/code/branches/network4/data/levels/templates/spaceshipSpacecruiser.oxt	7497-7755
/code/branches/network5/data/levels/templates/spaceshipSpacecruiser.oxt	7757-7781
/code/branches/network6/data/levels/templates/spaceshipSpacecruiser.oxt	7823-8315
/code/branches/network64/data/levels/templates/spaceshipSpacecruiser.oxt	2210-2355
/code/branches/notifications/data/levels/templates/spaceshipSpacecruiser.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/spaceshipSpacecruiser.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/spaceshipSpacecruiser.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/spaceshipSpacecruiser.oxt	7506-7788
/code/branches/output/data/levels/templates/spaceshipSpacecruiser.oxt	8739-8857
/code/branches/overlay/data/levels/templates/spaceshipSpacecruiser.oxt	2117-2385
/code/branches/particles/data/levels/templates/spaceshipSpacecruiser.oxt	2829-3085
/code/branches/particles2/data/levels/templates/spaceshipSpacecruiser.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/spaceshipSpacecruiser.oxt	3113-3194
/code/branches/physics/data/levels/templates/spaceshipSpacecruiser.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/spaceshipSpacecruiser.oxt	2436-2457
/code/branches/pickup/data/levels/templates/spaceshipSpacecruiser.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/spaceshipSpacecruiser.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/spaceshipSpacecruiser.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/spaceshipSpacecruiser.oxt	6594-6710
/code/branches/pickups/data/levels/templates/spaceshipSpacecruiser.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/spaceshipSpacecruiser.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/spaceshipSpacecruiser.oxt	7262-7263
/code/branches/portals/data/levels/templates/spaceshipSpacecruiser.oxt	8087-8455
/code/branches/portals2/data/levels/templates/spaceshipSpacecruiser.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/spaceshipSpacecruiser.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/spaceshipSpacecruiser.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/spaceshipSpacecruiser.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/spaceshipSpacecruiser.oxt	7003-7089
/code/branches/presentation/data/levels/templates/spaceshipSpacecruiser.oxt	2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/spaceshipSpacecruiser.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/spaceshipSpacecruiser.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/spaceshipSpacecruiser.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/spaceshipSpacecruiser.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/spaceshipSpacecruiser.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/spaceshipSpacecruiser.oxt	7614-7647
/code/branches/resource/data/levels/templates/spaceshipSpacecruiser.oxt	3327-3366
/code/branches/resource2/data/levels/templates/spaceshipSpacecruiser.oxt	3372-5694
/code/branches/rocket/data/levels/templates/spaceshipSpacecruiser.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/spaceshipSpacecruiser.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/spaceshipSpacecruiser.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/spaceshipSpacecruiser.oxt	6559-6989
/code/branches/sound/data/levels/templates/spaceshipSpacecruiser.oxt	2829-3010
/code/branches/sound3/data/levels/templates/spaceshipSpacecruiser.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/spaceshipSpacecruiser.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/spaceshipSpacecruiser.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/spaceshipSpacecruiser.oxt	8182-8630
/code/branches/spaceraceTwo/data/levels/templates/spaceshipSpacecruiser.oxt	8881-8996
/code/branches/steering/data/levels/templates/spaceshipSpacecruiser.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/spaceshipSpacecruiser.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/spaceshipSpacecruiser.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/spaceshipSpacecruiser.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/spaceshipSpacecruiser.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/spaceshipSpacecruiser.oxt	8440-8716
/code/branches/usability/data/levels/templates/spaceshipSpacecruiser.oxt	7915-8078
/code/branches/weapon/data/levels/templates/spaceshipSpacecruiser.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/spaceshipSpacecruiser.oxt	2107-2488
/code/branches/weapons/data/levels/templates/spaceshipSpacecruiser.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/spaceshipSpacecruiser.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/spaceshipSwallow.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/environment3/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/formation/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/hud/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/menue/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/output/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/usability/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/trunk/data/levels/templates/spaceshipSwallow.oxt	merged	eligible
/code/branches/ai/data/levels/templates/spaceshipSwallow.oxt	6592-7033
/code/branches/ai2/data/levels/templates/spaceshipSwallow.oxt	8721-8880
/code/branches/bigships/data/levels/templates/spaceshipSwallow.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/spaceshipSwallow.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/spaceshipSwallow.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/spaceshipSwallow.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/spaceshipSwallow.oxt	1802-1808
/code/branches/chat/data/levels/templates/spaceshipSwallow.oxt	6527-6797
/code/branches/chat2/data/levels/templates/spaceshipSwallow.oxt	6836-6910
/code/branches/console/data/levels/templates/spaceshipSwallow.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/spaceshipSwallow.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/spaceshipSwallow.oxt	7178-7283
/code/branches/core3/data/levels/templates/spaceshipSwallow.oxt	1572-1739
/code/branches/core4/data/levels/templates/spaceshipSwallow.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/spaceshipSwallow.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/spaceshipSwallow.oxt	7537-7686
/code/branches/doc/data/levels/templates/spaceshipSwallow.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/spaceshipSwallow.oxt	8101-8192
/code/branches/dynamicmatch/data/levels/templates/spaceshipSwallow.oxt	6584-7030
/code/branches/fps/data/levels/templates/spaceshipSwallow.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/spaceshipSwallow.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/spaceshipSwallow.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/spaceshipSwallow.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/spaceshipSwallow.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/spaceshipSwallow.oxt	1580
/code/branches/gui/data/levels/templates/spaceshipSwallow.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/spaceshipSwallow.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/spaceshipSwallow.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/spaceshipSwallow.oxt	6000-6023
/code/branches/input/data/levels/templates/spaceshipSwallow.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/spaceshipSwallow.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/spaceshipSwallow.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/spaceshipSwallow.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/spaceshipSwallow.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/spaceshipSwallow.oxt	7903-8175
/code/branches/libraries/data/levels/templates/spaceshipSwallow.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/spaceshipSwallow.oxt	5703-5737
/code/branches/lod/data/levels/templates/spaceshipSwallow.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/spaceshipSwallow.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/spaceshipSwallow.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/spaceshipSwallow.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/spaceshipSwallow.oxt	7502-7738
/code/branches/menu/data/levels/templates/spaceshipSwallow.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/spaceshipSwallow.oxt	2754-2824
/code/branches/netp2/data/levels/templates/spaceshipSwallow.oxt	2835-2988
/code/branches/netp3/data/levels/templates/spaceshipSwallow.oxt	2988-3082
/code/branches/netp6/data/levels/templates/spaceshipSwallow.oxt	3214-3302
/code/branches/network/data/levels/templates/spaceshipSwallow.oxt	2356
/code/branches/network2/data/levels/templates/spaceshipSwallow.oxt	6434-6465
/code/branches/network3/data/levels/templates/spaceshipSwallow.oxt	7196-7344
/code/branches/network4/data/levels/templates/spaceshipSwallow.oxt	7497-7755
/code/branches/network5/data/levels/templates/spaceshipSwallow.oxt	7757-7781
/code/branches/network6/data/levels/templates/spaceshipSwallow.oxt	7823-8315
/code/branches/network64/data/levels/templates/spaceshipSwallow.oxt	2210-2355
/code/branches/notifications/data/levels/templates/spaceshipSwallow.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/spaceshipSwallow.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/spaceshipSwallow.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/spaceshipSwallow.oxt	7506-7788
/code/branches/overlay/data/levels/templates/spaceshipSwallow.oxt	2117-2385
/code/branches/particles/data/levels/templates/spaceshipSwallow.oxt	2829-3085
/code/branches/particles2/data/levels/templates/spaceshipSwallow.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/spaceshipSwallow.oxt	3113-3194
/code/branches/physics/data/levels/templates/spaceshipSwallow.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/spaceshipSwallow.oxt	2436-2457
/code/branches/pickup/data/levels/templates/spaceshipSwallow.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/spaceshipSwallow.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/spaceshipSwallow.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/spaceshipSwallow.oxt	6594-6710
/code/branches/pickups/data/levels/templates/spaceshipSwallow.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/spaceshipSwallow.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/spaceshipSwallow.oxt	7262-7263
/code/branches/portals/data/levels/templates/spaceshipSwallow.oxt	8087-8455
/code/branches/portals2/data/levels/templates/spaceshipSwallow.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/spaceshipSwallow.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/spaceshipSwallow.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/spaceshipSwallow.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/spaceshipSwallow.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/spaceshipSwallow.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/spaceshipSwallow.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/spaceshipSwallow.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/spaceshipSwallow.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/spaceshipSwallow.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/spaceshipSwallow.oxt	7614-7647
/code/branches/resource/data/levels/templates/spaceshipSwallow.oxt	3327-3366
/code/branches/resource2/data/levels/templates/spaceshipSwallow.oxt	3372-5694
/code/branches/rocket/data/levels/templates/spaceshipSwallow.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/spaceshipSwallow.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/spaceshipSwallow.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/spaceshipSwallow.oxt	6559-6989
/code/branches/sound/data/levels/templates/spaceshipSwallow.oxt	2829-3010
/code/branches/sound3/data/levels/templates/spaceshipSwallow.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/spaceshipSwallow.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/spaceshipSwallow.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/spaceshipSwallow.oxt	8182-8630
/code/branches/steering/data/levels/templates/spaceshipSwallow.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/spaceshipSwallow.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/spaceshipSwallow.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/spaceshipSwallow.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/spaceshipSwallow.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/spaceshipSwallow.oxt	8440-8716
/code/branches/weapon/data/levels/templates/spaceshipSwallow.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/spaceshipSwallow.oxt	2107-2488
/code/branches/weapons/data/levels/templates/spaceshipSwallow.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/spaceshipSwallow.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/spaceshipTransporter.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/environment3/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/formation/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/hud/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/menue/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/output/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/usability/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/trunk/data/levels/templates/spaceshipTransporter.oxt	merged	eligible
/code/branches/ai/data/levels/templates/spaceshipTransporter.oxt	6592-7033
/code/branches/ai2/data/levels/templates/spaceshipTransporter.oxt	8721-8880
/code/branches/bigships/data/levels/templates/spaceshipTransporter.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/spaceshipTransporter.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/spaceshipTransporter.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/spaceshipTransporter.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/spaceshipTransporter.oxt	1802-1808
/code/branches/chat/data/levels/templates/spaceshipTransporter.oxt	6527-6797
/code/branches/chat2/data/levels/templates/spaceshipTransporter.oxt	6836-6910
/code/branches/console/data/levels/templates/spaceshipTransporter.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/spaceshipTransporter.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/spaceshipTransporter.oxt	7178-7283
/code/branches/core3/data/levels/templates/spaceshipTransporter.oxt	1572-1739
/code/branches/core4/data/levels/templates/spaceshipTransporter.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/spaceshipTransporter.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/spaceshipTransporter.oxt	7537-7686
/code/branches/doc/data/levels/templates/spaceshipTransporter.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/spaceshipTransporter.oxt	8101-8192
/code/branches/dynamicmatch/data/levels/templates/spaceshipTransporter.oxt	6584-7030
/code/branches/fps/data/levels/templates/spaceshipTransporter.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/spaceshipTransporter.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/spaceshipTransporter.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/spaceshipTransporter.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/spaceshipTransporter.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/spaceshipTransporter.oxt	1580
/code/branches/gui/data/levels/templates/spaceshipTransporter.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/spaceshipTransporter.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/spaceshipTransporter.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/spaceshipTransporter.oxt	6000-6023
/code/branches/input/data/levels/templates/spaceshipTransporter.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/spaceshipTransporter.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/spaceshipTransporter.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/spaceshipTransporter.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/spaceshipTransporter.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/spaceshipTransporter.oxt	7903-8175
/code/branches/libraries/data/levels/templates/spaceshipTransporter.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/spaceshipTransporter.oxt	5703-5737
/code/branches/lod/data/levels/templates/spaceshipTransporter.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/spaceshipTransporter.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/spaceshipTransporter.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/spaceshipTransporter.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/spaceshipTransporter.oxt	7502-7738
/code/branches/menu/data/levels/templates/spaceshipTransporter.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/spaceshipTransporter.oxt	2754-2824
/code/branches/netp2/data/levels/templates/spaceshipTransporter.oxt	2835-2988
/code/branches/netp3/data/levels/templates/spaceshipTransporter.oxt	2988-3082
/code/branches/netp6/data/levels/templates/spaceshipTransporter.oxt	3214-3302
/code/branches/network/data/levels/templates/spaceshipTransporter.oxt	2356
/code/branches/network2/data/levels/templates/spaceshipTransporter.oxt	6434-6465
/code/branches/network3/data/levels/templates/spaceshipTransporter.oxt	7196-7344
/code/branches/network4/data/levels/templates/spaceshipTransporter.oxt	7497-7755
/code/branches/network5/data/levels/templates/spaceshipTransporter.oxt	7757-7781
/code/branches/network6/data/levels/templates/spaceshipTransporter.oxt	7823-8315
/code/branches/network64/data/levels/templates/spaceshipTransporter.oxt	2210-2355
/code/branches/notifications/data/levels/templates/spaceshipTransporter.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/spaceshipTransporter.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/spaceshipTransporter.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/spaceshipTransporter.oxt	7506-7788
/code/branches/overlay/data/levels/templates/spaceshipTransporter.oxt	2117-2385
/code/branches/particles/data/levels/templates/spaceshipTransporter.oxt	2829-3085
/code/branches/particles2/data/levels/templates/spaceshipTransporter.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/spaceshipTransporter.oxt	3113-3194
/code/branches/physics/data/levels/templates/spaceshipTransporter.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/spaceshipTransporter.oxt	2436-2457
/code/branches/pickup/data/levels/templates/spaceshipTransporter.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/spaceshipTransporter.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/spaceshipTransporter.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/spaceshipTransporter.oxt	6594-6710
/code/branches/pickups/data/levels/templates/spaceshipTransporter.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/spaceshipTransporter.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/spaceshipTransporter.oxt	7262-7263
/code/branches/portals/data/levels/templates/spaceshipTransporter.oxt	8087-8455
/code/branches/portals2/data/levels/templates/spaceshipTransporter.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/spaceshipTransporter.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/spaceshipTransporter.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/spaceshipTransporter.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/spaceshipTransporter.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/spaceshipTransporter.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/spaceshipTransporter.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/spaceshipTransporter.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/spaceshipTransporter.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/spaceshipTransporter.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/spaceshipTransporter.oxt	7614-7647
/code/branches/resource/data/levels/templates/spaceshipTransporter.oxt	3327-3366
/code/branches/resource2/data/levels/templates/spaceshipTransporter.oxt	3372-5694
/code/branches/rocket/data/levels/templates/spaceshipTransporter.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/spaceshipTransporter.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/spaceshipTransporter.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/spaceshipTransporter.oxt	6559-6989
/code/branches/sound/data/levels/templates/spaceshipTransporter.oxt	2829-3010
/code/branches/sound3/data/levels/templates/spaceshipTransporter.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/spaceshipTransporter.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/spaceshipTransporter.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/spaceshipTransporter.oxt	8182-8630
/code/branches/steering/data/levels/templates/spaceshipTransporter.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/spaceshipTransporter.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/spaceshipTransporter.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/spaceshipTransporter.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/spaceshipTransporter.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/spaceshipTransporter.oxt	8440-8716
/code/branches/weapon/data/levels/templates/spaceshipTransporter.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/spaceshipTransporter.oxt	2107-2488
/code/branches/weapons/data/levels/templates/spaceshipTransporter.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/spaceshipTransporter.oxt	2742-2890

code/branches/presentation2012/data/levels/templates/spaceshipTransporterSL.oxt

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/environment3/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/formation/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/gamecontent/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/hud/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/masterserverfix/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/menue/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/newlevel2012/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/output/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/pickup2012/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/presentation/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/presentation2011/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/shipSelection/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/sound2012/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/spacegate/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/spaceraceTwo/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/surfaceRace/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/usability/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/trunk/data/levels/templates/spaceshipTransporterSL.oxt	merged	eligible
/code/branches/ai/data/levels/templates/spaceshipTransporterSL.oxt	6592-7033
/code/branches/ai2/data/levels/templates/spaceshipTransporterSL.oxt	8721-8880
/code/branches/bigships/data/levels/templates/spaceshipTransporterSL.oxt	8137-8588
/code/branches/buildsystem/data/levels/templates/spaceshipTransporterSL.oxt	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/templates/spaceshipTransporterSL.oxt	2506-2658
/code/branches/buildsystem3/data/levels/templates/spaceshipTransporterSL.oxt	2662-2708
/code/branches/ceguilua/data/levels/templates/spaceshipTransporterSL.oxt	1802-1808
/code/branches/chat/data/levels/templates/spaceshipTransporterSL.oxt	6527-6797
/code/branches/chat2/data/levels/templates/spaceshipTransporterSL.oxt	6836-6910
/code/branches/console/data/levels/templates/spaceshipTransporterSL.oxt	5941-6104
/code/branches/consolecommands2/data/levels/templates/spaceshipTransporterSL.oxt	6451-7178
/code/branches/consolecommands3/data/levels/templates/spaceshipTransporterSL.oxt	7178-7283
/code/branches/core3/data/levels/templates/spaceshipTransporterSL.oxt	1572-1739
/code/branches/core4/data/levels/templates/spaceshipTransporterSL.oxt	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/templates/spaceshipTransporterSL.oxt	5768-5928,6009
/code/branches/data_cleanup/data/levels/templates/spaceshipTransporterSL.oxt	7537-7686
/code/branches/doc/data/levels/templates/spaceshipTransporterSL.oxt	7290-7400
/code/branches/dockingsystem/data/levels/templates/spaceshipTransporterSL.oxt	8101-8192
/code/branches/dynamicmatch/data/levels/templates/spaceshipTransporterSL.oxt	6584-7030
/code/branches/fps/data/levels/templates/spaceshipTransporterSL.oxt	6591-7072
/code/branches/gameimmersion/data/levels/templates/spaceshipTransporterSL.oxt	8102-8577
/code/branches/gamestate/data/levels/templates/spaceshipTransporterSL.oxt	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/templates/spaceshipTransporterSL.oxt	6594-6745
/code/branches/gametypes/data/levels/templates/spaceshipTransporterSL.oxt	2826-3031
/code/branches/gcc43/data/levels/templates/spaceshipTransporterSL.oxt	1580
/code/branches/gui/data/levels/templates/spaceshipTransporterSL.oxt	1635-1723,2795-2894
/code/branches/hudelements/data/levels/templates/spaceshipTransporterSL.oxt	6584-6941
/code/branches/hudimprovements/data/levels/templates/spaceshipTransporterSL.oxt	7920-8672
/code/branches/ingamemenu/data/levels/templates/spaceshipTransporterSL.oxt	6000-6023
/code/branches/input/data/levels/templates/spaceshipTransporterSL.oxt	1629-1636
/code/branches/ipv6/data/levels/templates/spaceshipTransporterSL.oxt	7293-7458
/code/branches/kicklib/data/levels/templates/spaceshipTransporterSL.oxt	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/templates/spaceshipTransporterSL.oxt	8282-8350
/code/branches/lastmanstanding/data/levels/templates/spaceshipTransporterSL.oxt	7479-7644
/code/branches/lastmanstanding3/data/levels/templates/spaceshipTransporterSL.oxt	7903-8175
/code/branches/libraries/data/levels/templates/spaceshipTransporterSL.oxt	5612-5692
/code/branches/libraries2/data/levels/templates/spaceshipTransporterSL.oxt	5703-5737
/code/branches/lod/data/levels/templates/spaceshipTransporterSL.oxt	6586-6911
/code/branches/lodfinal/data/levels/templates/spaceshipTransporterSL.oxt	2372-2411
/code/branches/mac_osx/data/levels/templates/spaceshipTransporterSL.oxt	7789-8128,8135
/code/branches/map/data/levels/templates/spaceshipTransporterSL.oxt	2801-3086,3089
/code/branches/masterserver/data/levels/templates/spaceshipTransporterSL.oxt	7502-7738
/code/branches/menu/data/levels/templates/spaceshipTransporterSL.oxt	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/templates/spaceshipTransporterSL.oxt	2754-2824
/code/branches/netp2/data/levels/templates/spaceshipTransporterSL.oxt	2835-2988
/code/branches/netp3/data/levels/templates/spaceshipTransporterSL.oxt	2988-3082
/code/branches/netp6/data/levels/templates/spaceshipTransporterSL.oxt	3214-3302
/code/branches/network/data/levels/templates/spaceshipTransporterSL.oxt	2356
/code/branches/network2/data/levels/templates/spaceshipTransporterSL.oxt	6434-6465
/code/branches/network3/data/levels/templates/spaceshipTransporterSL.oxt	7196-7344
/code/branches/network4/data/levels/templates/spaceshipTransporterSL.oxt	7497-7755
/code/branches/network5/data/levels/templates/spaceshipTransporterSL.oxt	7757-7781
/code/branches/network6/data/levels/templates/spaceshipTransporterSL.oxt	7823-8315
/code/branches/network64/data/levels/templates/spaceshipTransporterSL.oxt	2210-2355
/code/branches/notifications/data/levels/templates/spaceshipTransporterSL.oxt	7314-7401
/code/branches/objecthierarchy/data/levels/templates/spaceshipTransporterSL.oxt	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/templates/spaceshipTransporterSL.oxt	2171-2479
/code/branches/ois_update/data/levels/templates/spaceshipTransporterSL.oxt	7506-7788
/code/branches/overlay/data/levels/templates/spaceshipTransporterSL.oxt	2117-2385
/code/branches/particles/data/levels/templates/spaceshipTransporterSL.oxt	2829-3085
/code/branches/particles2/data/levels/templates/spaceshipTransporterSL.oxt	6050-6106,6109
/code/branches/pch/data/levels/templates/spaceshipTransporterSL.oxt	3113-3194
/code/branches/physics/data/levels/templates/spaceshipTransporterSL.oxt	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/templates/spaceshipTransporterSL.oxt	2436-2457
/code/branches/pickup/data/levels/templates/spaceshipTransporterSL.oxt	8145-8555
/code/branches/pickup2/data/levels/templates/spaceshipTransporterSL.oxt	5942-6405
/code/branches/pickup3/data/levels/templates/spaceshipTransporterSL.oxt	6418-6523
/code/branches/pickup4/data/levels/templates/spaceshipTransporterSL.oxt	6594-6710
/code/branches/pickups/data/levels/templates/spaceshipTransporterSL.oxt	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/templates/spaceshipTransporterSL.oxt	2107-2497,2915-3071
/code/branches/png2/data/levels/templates/spaceshipTransporterSL.oxt	7262-7263
/code/branches/portals/data/levels/templates/spaceshipTransporterSL.oxt	8087-8455
/code/branches/portals2/data/levels/templates/spaceshipTransporterSL.oxt	8460-8602
/code/branches/ppspickups1/data/levels/templates/spaceshipTransporterSL.oxt	6552-6708
/code/branches/ppspickups2/data/levels/templates/spaceshipTransporterSL.oxt	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/templates/spaceshipTransporterSL.oxt	6757-6997
/code/branches/ppspickups4/data/levels/templates/spaceshipTransporterSL.oxt	7003-7089
/code/branches/presentation2/data/levels/templates/spaceshipTransporterSL.oxt	6106-6416,7787-7800
/code/branches/presentation3/data/levels/templates/spaceshipTransporterSL.oxt	6913-7162
/code/branches/questsystem/data/levels/templates/spaceshipTransporterSL.oxt	1894-2088
/code/branches/questsystem2/data/levels/templates/spaceshipTransporterSL.oxt	2107-2259
/code/branches/questsystem5/data/levels/templates/spaceshipTransporterSL.oxt	2776-2905
/code/branches/releasetodo/data/levels/templates/spaceshipTransporterSL.oxt	7614-7647
/code/branches/resource/data/levels/templates/spaceshipTransporterSL.oxt	3327-3366
/code/branches/resource2/data/levels/templates/spaceshipTransporterSL.oxt	3372-5694
/code/branches/rocket/data/levels/templates/spaceshipTransporterSL.oxt	6523-6950
/code/branches/rocket2/data/levels/templates/spaceshipTransporterSL.oxt	6953-6970
/code/branches/script_trigger/data/levels/templates/spaceshipTransporterSL.oxt	1295-1953,1955
/code/branches/skybox2/data/levels/templates/spaceshipTransporterSL.oxt	6559-6989
/code/branches/sound/data/levels/templates/spaceshipTransporterSL.oxt	2829-3010
/code/branches/sound3/data/levels/templates/spaceshipTransporterSL.oxt	5941-6102
/code/branches/spaceboundaries/data/levels/templates/spaceshipTransporterSL.oxt	8085-8457
/code/branches/spaceboundaries2/data/levels/templates/spaceshipTransporterSL.oxt	8460-8613
/code/branches/spacerace/data/levels/templates/spaceshipTransporterSL.oxt	8182-8630
/code/branches/steering/data/levels/templates/spaceshipTransporterSL.oxt	5949-6091,8140-8595
/code/branches/tetris/data/levels/templates/spaceshipTransporterSL.oxt	8100-8563
/code/branches/tutoriallevel/data/levels/templates/spaceshipTransporterSL.oxt	7827-8370
/code/branches/tutoriallevel2/data/levels/templates/spaceshipTransporterSL.oxt	8370-8452
/code/branches/tutoriallevel3/data/levels/templates/spaceshipTransporterSL.oxt	8453-8636
/code/branches/unity_build/data/levels/templates/spaceshipTransporterSL.oxt	8440-8716
/code/branches/weapon/data/levels/templates/spaceshipTransporterSL.oxt	1925-2094
/code/branches/weapon2/data/levels/templates/spaceshipTransporterSL.oxt	2107-2488
/code/branches/weapons/data/levels/templates/spaceshipTransporterSL.oxt	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/templates/spaceshipTransporterSL.oxt	2742-2890

code/branches/presentation2012/data/levels/testStars.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/testStars.oxw	merged	eligible
/code/branches/environment3/data/levels/testStars.oxw	merged	eligible
/code/branches/formation/data/levels/testStars.oxw	merged	eligible
/code/branches/gamecontent/data/levels/testStars.oxw	merged	eligible
/code/branches/hud/data/levels/testStars.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/testStars.oxw	merged	eligible
/code/branches/menue/data/levels/testStars.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/testStars.oxw	merged	eligible
/code/branches/output/data/levels/testStars.oxw	merged	eligible
/code/branches/pickup2012/data/levels/testStars.oxw	merged	eligible
/code/branches/presentation/data/levels/testStars.oxw	merged	eligible
/code/branches/presentation2011/data/levels/testStars.oxw	merged	eligible
/code/branches/shipSelection/data/levels/testStars.oxw	merged	eligible
/code/branches/sound2012/data/levels/testStars.oxw	merged	eligible
/code/branches/spacegate/data/levels/testStars.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/testStars.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/testStars.oxw	merged	eligible
/code/branches/usability/data/levels/testStars.oxw	merged	eligible
/code/trunk/data/levels/testStars.oxw	merged	eligible
/code/branches/ai/data/levels/testStars.oxw	6592-7033
/code/branches/ai2/data/levels/testStars.oxw	8721-8880
/code/branches/bigships/data/levels/testStars.oxw	8137-8588
/code/branches/buildsystem/data/levels/testStars.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/testStars.oxw	2506-2658
/code/branches/buildsystem3/data/levels/testStars.oxw	2662-2708
/code/branches/ceguilua/data/levels/testStars.oxw	1802-1808
/code/branches/chat/data/levels/testStars.oxw	6527-6797
/code/branches/chat2/data/levels/testStars.oxw	6836-6910
/code/branches/console/data/levels/testStars.oxw	5941-6104
/code/branches/consolecommands2/data/levels/testStars.oxw	6451-7178
/code/branches/consolecommands3/data/levels/testStars.oxw	7178-7283
/code/branches/core3/data/levels/testStars.oxw	1572-1739
/code/branches/core4/data/levels/testStars.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/testStars.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/testStars.oxw	7537-7686
/code/branches/doc/data/levels/testStars.oxw	7290-7400
/code/branches/dockingsystem/data/levels/testStars.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/testStars.oxw	6584-7030
/code/branches/fps/data/levels/testStars.oxw	6591-7072
/code/branches/gameimmersion/data/levels/testStars.oxw	8102-8577
/code/branches/gamestate/data/levels/testStars.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/testStars.oxw	6594-6745
/code/branches/gametypes/data/levels/testStars.oxw	2826-3031
/code/branches/gcc43/data/levels/testStars.oxw	1580
/code/branches/gui/data/levels/testStars.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/testStars.oxw	6584-6941
/code/branches/hudimprovements/data/levels/testStars.oxw	7920-8672
/code/branches/ingamemenu/data/levels/testStars.oxw	6000-6023
/code/branches/input/data/levels/testStars.oxw	1629-1636
/code/branches/ipv6/data/levels/testStars.oxw	7293-7458
/code/branches/kicklib/data/levels/testStars.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/testStars.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/testStars.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/testStars.oxw	7903-8175
/code/branches/libraries/data/levels/testStars.oxw	5612-5692
/code/branches/libraries2/data/levels/testStars.oxw	5703-5737
/code/branches/lod/data/levels/testStars.oxw	6586-6911
/code/branches/lodfinal/data/levels/testStars.oxw	2372-2411
/code/branches/mac_osx/data/levels/testStars.oxw	7789-8128,8135
/code/branches/map/data/levels/testStars.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/testStars.oxw	7502-7738
/code/branches/menu/data/levels/testStars.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/testStars.oxw	2754-2824
/code/branches/netp2/data/levels/testStars.oxw	2835-2988
/code/branches/netp3/data/levels/testStars.oxw	2988-3082
/code/branches/netp6/data/levels/testStars.oxw	3214-3302
/code/branches/network/data/levels/testStars.oxw	2356
/code/branches/network2/data/levels/testStars.oxw	6434-6465
/code/branches/network3/data/levels/testStars.oxw	7196-7344
/code/branches/network4/data/levels/testStars.oxw	7497-7755
/code/branches/network5/data/levels/testStars.oxw	7757-7781
/code/branches/network6/data/levels/testStars.oxw	7823-8315
/code/branches/network64/data/levels/testStars.oxw	2210-2355
/code/branches/notifications/data/levels/testStars.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/testStars.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/testStars.oxw	2171-2479
/code/branches/ois_update/data/levels/testStars.oxw	7506-7788
/code/branches/overlay/data/levels/testStars.oxw	2117-2385
/code/branches/particles/data/levels/testStars.oxw	2829-3085
/code/branches/particles2/data/levels/testStars.oxw	6050-6106,6109
/code/branches/pch/data/levels/testStars.oxw	3113-3194
/code/branches/physics/data/levels/testStars.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/testStars.oxw	2436-2457
/code/branches/pickup/data/levels/testStars.oxw	8145-8555
/code/branches/pickup2/data/levels/testStars.oxw	5942-6405
/code/branches/pickup3/data/levels/testStars.oxw	6418-6523
/code/branches/pickup4/data/levels/testStars.oxw	6594-6710
/code/branches/pickups/data/levels/testStars.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/testStars.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/testStars.oxw	7262-7263
/code/branches/portals/data/levels/testStars.oxw	8087-8455
/code/branches/portals2/data/levels/testStars.oxw	8460-8602
/code/branches/ppspickups1/data/levels/testStars.oxw	6552-6708
/code/branches/ppspickups2/data/levels/testStars.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/testStars.oxw	6757-6997
/code/branches/ppspickups4/data/levels/testStars.oxw	7003-7089
/code/branches/presentation2/data/levels/testStars.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/testStars.oxw	6913-7162
/code/branches/questsystem/data/levels/testStars.oxw	1894-2088
/code/branches/questsystem2/data/levels/testStars.oxw	2107-2259
/code/branches/questsystem5/data/levels/testStars.oxw	2776-2905
/code/branches/releasetodo/data/levels/testStars.oxw	7614-7647
/code/branches/resource/data/levels/testStars.oxw	3327-3366
/code/branches/resource2/data/levels/testStars.oxw	3372-5694
/code/branches/rocket/data/levels/testStars.oxw	6523-6950
/code/branches/rocket2/data/levels/testStars.oxw	6953-6970
/code/branches/script_trigger/data/levels/testStars.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/testStars.oxw	6559-6989
/code/branches/sound/data/levels/testStars.oxw	2829-3010
/code/branches/sound3/data/levels/testStars.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/testStars.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/testStars.oxw	8460-8613
/code/branches/spacerace/data/levels/testStars.oxw	8182-8630
/code/branches/steering/data/levels/testStars.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/testStars.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/testStars.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/testStars.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/testStars.oxw	8453-8636
/code/branches/unity_build/data/levels/testStars.oxw	8440-8716
/code/branches/weapon/data/levels/testStars.oxw	1925-2094
/code/branches/weapon2/data/levels/testStars.oxw	2107-2488
/code/branches/weapons/data/levels/testStars.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/testStars.oxw	2742-2890

code/branches/presentation2012/data/levels/testSwallow.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/testSwallow.oxw	merged	eligible
/code/branches/environment3/data/levels/testSwallow.oxw	merged	eligible
/code/branches/formation/data/levels/testSwallow.oxw	merged	eligible
/code/branches/gamecontent/data/levels/testSwallow.oxw	merged	eligible
/code/branches/hud/data/levels/testSwallow.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/testSwallow.oxw	merged	eligible
/code/branches/menue/data/levels/testSwallow.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/testSwallow.oxw	merged	eligible
/code/branches/output/data/levels/testSwallow.oxw	merged	eligible
/code/branches/pickup2012/data/levels/testSwallow.oxw	merged	eligible
/code/branches/presentation/data/levels/testSwallow.oxw	merged	eligible
/code/branches/presentation2011/data/levels/testSwallow.oxw	merged	eligible
/code/branches/shipSelection/data/levels/testSwallow.oxw	merged	eligible
/code/branches/sound2012/data/levels/testSwallow.oxw	merged	eligible
/code/branches/spacegate/data/levels/testSwallow.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/testSwallow.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/testSwallow.oxw	merged	eligible
/code/branches/usability/data/levels/testSwallow.oxw	merged	eligible
/code/trunk/data/levels/testSwallow.oxw	merged	eligible
/code/branches/ai/data/levels/testSwallow.oxw	6592-7033
/code/branches/ai2/data/levels/testSwallow.oxw	8721-8880
/code/branches/bigships/data/levels/testSwallow.oxw	8137-8588
/code/branches/buildsystem/data/levels/testSwallow.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/testSwallow.oxw	2506-2658
/code/branches/buildsystem3/data/levels/testSwallow.oxw	2662-2708
/code/branches/ceguilua/data/levels/testSwallow.oxw	1802-1808
/code/branches/chat/data/levels/testSwallow.oxw	6527-6797
/code/branches/chat2/data/levels/testSwallow.oxw	6836-6910
/code/branches/console/data/levels/testSwallow.oxw	5941-6104
/code/branches/consolecommands2/data/levels/testSwallow.oxw	6451-7178
/code/branches/consolecommands3/data/levels/testSwallow.oxw	7178-7283
/code/branches/core3/data/levels/testSwallow.oxw	1572-1739
/code/branches/core4/data/levels/testSwallow.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/testSwallow.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/testSwallow.oxw	7537-7686
/code/branches/doc/data/levels/testSwallow.oxw	7290-7400
/code/branches/dockingsystem/data/levels/testSwallow.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/testSwallow.oxw	6584-7030
/code/branches/fps/data/levels/testSwallow.oxw	6591-7072
/code/branches/gameimmersion/data/levels/testSwallow.oxw	8102-8577
/code/branches/gamestate/data/levels/testSwallow.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/testSwallow.oxw	6594-6745
/code/branches/gametypes/data/levels/testSwallow.oxw	2826-3031
/code/branches/gcc43/data/levels/testSwallow.oxw	1580
/code/branches/gui/data/levels/testSwallow.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/testSwallow.oxw	6584-6941
/code/branches/hudimprovements/data/levels/testSwallow.oxw	7920-8672
/code/branches/ingamemenu/data/levels/testSwallow.oxw	6000-6023
/code/branches/input/data/levels/testSwallow.oxw	1629-1636
/code/branches/ipv6/data/levels/testSwallow.oxw	7293-7458
/code/branches/kicklib/data/levels/testSwallow.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/testSwallow.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/testSwallow.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/testSwallow.oxw	7903-8175
/code/branches/libraries/data/levels/testSwallow.oxw	5612-5692
/code/branches/libraries2/data/levels/testSwallow.oxw	5703-5737
/code/branches/lod/data/levels/testSwallow.oxw	6586-6911
/code/branches/lodfinal/data/levels/testSwallow.oxw	2372-2411
/code/branches/mac_osx/data/levels/testSwallow.oxw	7789-8128,8135
/code/branches/map/data/levels/testSwallow.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/testSwallow.oxw	7502-7738
/code/branches/menu/data/levels/testSwallow.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/testSwallow.oxw	2754-2824
/code/branches/netp2/data/levels/testSwallow.oxw	2835-2988
/code/branches/netp3/data/levels/testSwallow.oxw	2988-3082
/code/branches/netp6/data/levels/testSwallow.oxw	3214-3302
/code/branches/network/data/levels/testSwallow.oxw	2356
/code/branches/network2/data/levels/testSwallow.oxw	6434-6465
/code/branches/network3/data/levels/testSwallow.oxw	7196-7344
/code/branches/network4/data/levels/testSwallow.oxw	7497-7755
/code/branches/network5/data/levels/testSwallow.oxw	7757-7781
/code/branches/network6/data/levels/testSwallow.oxw	7823-8315
/code/branches/network64/data/levels/testSwallow.oxw	2210-2355
/code/branches/notifications/data/levels/testSwallow.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/testSwallow.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/testSwallow.oxw	2171-2479
/code/branches/ois_update/data/levels/testSwallow.oxw	7506-7788
/code/branches/overlay/data/levels/testSwallow.oxw	2117-2385
/code/branches/particles/data/levels/testSwallow.oxw	2829-3085
/code/branches/particles2/data/levels/testSwallow.oxw	6050-6106,6109
/code/branches/pch/data/levels/testSwallow.oxw	3113-3194
/code/branches/physics/data/levels/testSwallow.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/testSwallow.oxw	2436-2457
/code/branches/pickup/data/levels/testSwallow.oxw	8145-8555
/code/branches/pickup2/data/levels/testSwallow.oxw	5942-6405
/code/branches/pickup3/data/levels/testSwallow.oxw	6418-6523
/code/branches/pickup4/data/levels/testSwallow.oxw	6594-6710
/code/branches/pickups/data/levels/testSwallow.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/testSwallow.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/testSwallow.oxw	7262-7263
/code/branches/portals/data/levels/testSwallow.oxw	8087-8455
/code/branches/portals2/data/levels/testSwallow.oxw	8460-8602
/code/branches/ppspickups1/data/levels/testSwallow.oxw	6552-6708
/code/branches/ppspickups2/data/levels/testSwallow.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/testSwallow.oxw	6757-6997
/code/branches/ppspickups4/data/levels/testSwallow.oxw	7003-7089
/code/branches/presentation2/data/levels/testSwallow.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/testSwallow.oxw	6913-7162
/code/branches/questsystem/data/levels/testSwallow.oxw	1894-2088
/code/branches/questsystem2/data/levels/testSwallow.oxw	2107-2259
/code/branches/questsystem5/data/levels/testSwallow.oxw	2776-2905
/code/branches/releasetodo/data/levels/testSwallow.oxw	7614-7647
/code/branches/resource/data/levels/testSwallow.oxw	3327-3366
/code/branches/resource2/data/levels/testSwallow.oxw	3372-5694
/code/branches/rocket/data/levels/testSwallow.oxw	6523-6950
/code/branches/rocket2/data/levels/testSwallow.oxw	6953-6970
/code/branches/script_trigger/data/levels/testSwallow.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/testSwallow.oxw	6559-6989
/code/branches/sound/data/levels/testSwallow.oxw	2829-3010
/code/branches/sound3/data/levels/testSwallow.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/testSwallow.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/testSwallow.oxw	8460-8613
/code/branches/spacerace/data/levels/testSwallow.oxw	8182-8630
/code/branches/steering/data/levels/testSwallow.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/testSwallow.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/testSwallow.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/testSwallow.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/testSwallow.oxw	8453-8636
/code/branches/unity_build/data/levels/testSwallow.oxw	8440-8716
/code/branches/weapon/data/levels/testSwallow.oxw	1925-2094
/code/branches/weapon2/data/levels/testSwallow.oxw	2107-2488
/code/branches/weapons/data/levels/testSwallow.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/testSwallow.oxw	2742-2890

code/branches/presentation2012/data/levels/tetris.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/environment3/data/levels/tetris.oxw	merged	eligible
/code/branches/formation/data/levels/tetris.oxw	merged	eligible
/code/branches/gamecontent/data/levels/tetris.oxw	merged	eligible
/code/branches/hud/data/levels/tetris.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/tetris.oxw	merged	eligible
/code/branches/menue/data/levels/tetris.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/tetris.oxw	merged	eligible
/code/branches/output/data/levels/tetris.oxw	merged	eligible
/code/branches/pickup2012/data/levels/tetris.oxw	merged	eligible
/code/branches/presentation/data/levels/tetris.oxw	merged	eligible
/code/branches/presentation2011/data/levels/tetris.oxw	merged	eligible
/code/branches/shipSelection/data/levels/tetris.oxw	merged	eligible
/code/branches/sound2012/data/levels/tetris.oxw	merged	eligible
/code/branches/spacegate/data/levels/tetris.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/tetris.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/tetris.oxw	merged	eligible
/code/trunk/data/levels/tetris.oxw	merged	eligible
/code/branches/ai/data/levels/tetris.oxw	6592-7033
/code/branches/ai2/data/levels/tetris.oxw	8721-8880
/code/branches/bigships/data/levels/tetris.oxw	8137-8588
/code/branches/buildsystem/data/levels/tetris.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/tetris.oxw	2506-2658
/code/branches/buildsystem3/data/levels/tetris.oxw	2662-2708
/code/branches/ceguilua/data/levels/tetris.oxw	1802-1808
/code/branches/chat/data/levels/tetris.oxw	6527-6797
/code/branches/chat2/data/levels/tetris.oxw	6836-6910
/code/branches/console/data/levels/tetris.oxw	5941-6104
/code/branches/consolecommands2/data/levels/tetris.oxw	6451-7178
/code/branches/consolecommands3/data/levels/tetris.oxw	7178-7283
/code/branches/core3/data/levels/tetris.oxw	1572-1739
/code/branches/core4/data/levels/tetris.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/tetris.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/tetris.oxw	7537-7686
/code/branches/doc/data/levels/tetris.oxw	7290-7400
/code/branches/dockingsystem/data/levels/tetris.oxw	8101-8192
/code/branches/dockingsystem2/data/levels/tetris.oxw	8196-8560
/code/branches/dynamicmatch/data/levels/tetris.oxw	6584-7030
/code/branches/fps/data/levels/tetris.oxw	6591-7072
/code/branches/gameimmersion/data/levels/tetris.oxw	8102-8577
/code/branches/gamestate/data/levels/tetris.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/tetris.oxw	6594-6745
/code/branches/gametypes/data/levels/tetris.oxw	2826-3031
/code/branches/gcc43/data/levels/tetris.oxw	1580
/code/branches/gui/data/levels/tetris.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/tetris.oxw	6584-6941
/code/branches/hudimprovements/data/levels/tetris.oxw	7920-8672
/code/branches/ingamemenu/data/levels/tetris.oxw	6000-6023
/code/branches/input/data/levels/tetris.oxw	1629-1636
/code/branches/ipv6/data/levels/tetris.oxw	7293-7458
/code/branches/kicklib/data/levels/tetris.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/tetris.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/tetris.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/tetris.oxw	7903-8175
/code/branches/libraries/data/levels/tetris.oxw	5612-5692
/code/branches/libraries2/data/levels/tetris.oxw	5703-5737
/code/branches/lod/data/levels/tetris.oxw	6586-6911
/code/branches/lodfinal/data/levels/tetris.oxw	2372-2411
/code/branches/mac_osx/data/levels/tetris.oxw	7789-8128,8135
/code/branches/map/data/levels/tetris.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/tetris.oxw	7502-7738
/code/branches/menu/data/levels/tetris.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/tetris.oxw	2754-2824
/code/branches/netp2/data/levels/tetris.oxw	2835-2988
/code/branches/netp3/data/levels/tetris.oxw	2988-3082
/code/branches/netp6/data/levels/tetris.oxw	3214-3302
/code/branches/network/data/levels/tetris.oxw	2356
/code/branches/network2/data/levels/tetris.oxw	6434-6465
/code/branches/network3/data/levels/tetris.oxw	7196-7344
/code/branches/network4/data/levels/tetris.oxw	7497-7755
/code/branches/network5/data/levels/tetris.oxw	7757-7781
/code/branches/network6/data/levels/tetris.oxw	7823-8315
/code/branches/network64/data/levels/tetris.oxw	2210-2355
/code/branches/notifications/data/levels/tetris.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/tetris.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/tetris.oxw	2171-2479
/code/branches/ois_update/data/levels/tetris.oxw	7506-7788
/code/branches/overlay/data/levels/tetris.oxw	2117-2385
/code/branches/particles/data/levels/tetris.oxw	2829-3085
/code/branches/particles2/data/levels/tetris.oxw	6050-6106,6109
/code/branches/pch/data/levels/tetris.oxw	3113-3194
/code/branches/physics/data/levels/tetris.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/tetris.oxw	2436-2457
/code/branches/pickup/data/levels/tetris.oxw	8145-8555
/code/branches/pickup2/data/levels/tetris.oxw	5942-6405
/code/branches/pickup3/data/levels/tetris.oxw	6418-6523
/code/branches/pickup4/data/levels/tetris.oxw	6594-6710
/code/branches/pickups/data/levels/tetris.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/tetris.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/tetris.oxw	7262-7263
/code/branches/portals/data/levels/tetris.oxw	8087-8455
/code/branches/portals2/data/levels/tetris.oxw	8460-8602
/code/branches/ppspickups1/data/levels/tetris.oxw	6552-6708
/code/branches/ppspickups2/data/levels/tetris.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/tetris.oxw	6757-6997
/code/branches/ppspickups4/data/levels/tetris.oxw	7003-7089
/code/branches/presentation2/data/levels/tetris.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/tetris.oxw	6913-7162
/code/branches/questsystem/data/levels/tetris.oxw	1894-2088
/code/branches/questsystem2/data/levels/tetris.oxw	2107-2259
/code/branches/questsystem5/data/levels/tetris.oxw	2776-2905
/code/branches/releasetodo/data/levels/tetris.oxw	7614-7647
/code/branches/resource/data/levels/tetris.oxw	3327-3366
/code/branches/resource2/data/levels/tetris.oxw	3372-5694
/code/branches/rocket/data/levels/tetris.oxw	6523-6950
/code/branches/rocket2/data/levels/tetris.oxw	6953-6970
/code/branches/script_trigger/data/levels/tetris.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/tetris.oxw	6559-6989
/code/branches/sound/data/levels/tetris.oxw	2829-3010
/code/branches/sound3/data/levels/tetris.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/tetris.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/tetris.oxw	8460-8613
/code/branches/spacerace/data/levels/tetris.oxw	8182-8630
/code/branches/steering/data/levels/tetris.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/tetris.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/tetris.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/tetris.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/tetris.oxw	8453-8636
/code/branches/unity_build/data/levels/tetris.oxw	8440-8716
/code/branches/usability/data/levels/tetris.oxw	7915-8078
/code/branches/weapon/data/levels/tetris.oxw	1925-2094
/code/branches/weapon2/data/levels/tetris.oxw	2107-2488
/code/branches/weapons/data/levels/tetris.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/tetris.oxw	2742-2890

code/branches/presentation2012/data/levels/theTimeMachine.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/environment3/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/formation/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/gamecontent/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/hud/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/menue/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/output/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/pickup2012/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/presentation/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/presentation2011/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/shipSelection/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/sound2012/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/spacegate/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/usability/data/levels/theTimeMachine.oxw	merged	eligible
/code/trunk/data/levels/theTimeMachine.oxw	merged	eligible
/code/branches/ai/data/levels/theTimeMachine.oxw	6592-7033
/code/branches/ai2/data/levels/theTimeMachine.oxw	8721-8880
/code/branches/bigships/data/levels/theTimeMachine.oxw	8137-8588
/code/branches/buildsystem/data/levels/theTimeMachine.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/theTimeMachine.oxw	2506-2658
/code/branches/buildsystem3/data/levels/theTimeMachine.oxw	2662-2708
/code/branches/ceguilua/data/levels/theTimeMachine.oxw	1802-1808
/code/branches/chat/data/levels/theTimeMachine.oxw	6527-6797
/code/branches/chat2/data/levels/theTimeMachine.oxw	6836-6910
/code/branches/console/data/levels/theTimeMachine.oxw	5941-6104
/code/branches/consolecommands2/data/levels/theTimeMachine.oxw	6451-7178
/code/branches/consolecommands3/data/levels/theTimeMachine.oxw	7178-7283
/code/branches/core3/data/levels/theTimeMachine.oxw	1572-1739
/code/branches/core4/data/levels/theTimeMachine.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/theTimeMachine.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/theTimeMachine.oxw	7537-7686
/code/branches/doc/data/levels/theTimeMachine.oxw	7290-7400
/code/branches/dockingsystem/data/levels/theTimeMachine.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/theTimeMachine.oxw	6584-7030
/code/branches/fps/data/levels/theTimeMachine.oxw	6591-7072
/code/branches/gameimmersion/data/levels/theTimeMachine.oxw	8102-8577
/code/branches/gamestate/data/levels/theTimeMachine.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/theTimeMachine.oxw	6594-6745
/code/branches/gametypes/data/levels/theTimeMachine.oxw	2826-3031
/code/branches/gcc43/data/levels/theTimeMachine.oxw	1580
/code/branches/gui/data/levels/theTimeMachine.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/theTimeMachine.oxw	6584-6941
/code/branches/hudimprovements/data/levels/theTimeMachine.oxw	7920-8672
/code/branches/ingamemenu/data/levels/theTimeMachine.oxw	6000-6023
/code/branches/input/data/levels/theTimeMachine.oxw	1629-1636
/code/branches/ipv6/data/levels/theTimeMachine.oxw	7293-7458
/code/branches/kicklib/data/levels/theTimeMachine.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/theTimeMachine.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/theTimeMachine.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/theTimeMachine.oxw	7903-8175
/code/branches/libraries/data/levels/theTimeMachine.oxw	5612-5692
/code/branches/libraries2/data/levels/theTimeMachine.oxw	5703-5737
/code/branches/lod/data/levels/theTimeMachine.oxw	6586-6911
/code/branches/lodfinal/data/levels/theTimeMachine.oxw	2372-2411
/code/branches/mac_osx/data/levels/theTimeMachine.oxw	7789-8128,8135
/code/branches/map/data/levels/theTimeMachine.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/theTimeMachine.oxw	7502-7738
/code/branches/menu/data/levels/theTimeMachine.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/theTimeMachine.oxw	2754-2824
/code/branches/netp2/data/levels/theTimeMachine.oxw	2835-2988
/code/branches/netp3/data/levels/theTimeMachine.oxw	2988-3082
/code/branches/netp6/data/levels/theTimeMachine.oxw	3214-3302
/code/branches/network/data/levels/theTimeMachine.oxw	2356
/code/branches/network2/data/levels/theTimeMachine.oxw	6434-6465
/code/branches/network3/data/levels/theTimeMachine.oxw	7196-7344
/code/branches/network4/data/levels/theTimeMachine.oxw	7497-7755
/code/branches/network5/data/levels/theTimeMachine.oxw	7757-7781
/code/branches/network6/data/levels/theTimeMachine.oxw	7823-8315
/code/branches/network64/data/levels/theTimeMachine.oxw	2210-2355
/code/branches/notifications/data/levels/theTimeMachine.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/theTimeMachine.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/theTimeMachine.oxw	2171-2479
/code/branches/ois_update/data/levels/theTimeMachine.oxw	7506-7788
/code/branches/overlay/data/levels/theTimeMachine.oxw	2117-2385
/code/branches/particles/data/levels/theTimeMachine.oxw	2829-3085
/code/branches/particles2/data/levels/theTimeMachine.oxw	6050-6106,6109
/code/branches/pch/data/levels/theTimeMachine.oxw	3113-3194
/code/branches/physics/data/levels/theTimeMachine.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/theTimeMachine.oxw	2436-2457
/code/branches/pickup/data/levels/theTimeMachine.oxw	8145-8555
/code/branches/pickup2/data/levels/theTimeMachine.oxw	5942-6405
/code/branches/pickup3/data/levels/theTimeMachine.oxw	6418-6523
/code/branches/pickup4/data/levels/theTimeMachine.oxw	6594-6710
/code/branches/pickups/data/levels/theTimeMachine.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/theTimeMachine.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/theTimeMachine.oxw	7262-7263
/code/branches/portals/data/levels/theTimeMachine.oxw	8087-8455
/code/branches/portals2/data/levels/theTimeMachine.oxw	8460-8602
/code/branches/ppspickups1/data/levels/theTimeMachine.oxw	6552-6708
/code/branches/ppspickups2/data/levels/theTimeMachine.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/theTimeMachine.oxw	6757-6997
/code/branches/ppspickups4/data/levels/theTimeMachine.oxw	7003-7089
/code/branches/presentation2/data/levels/theTimeMachine.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/theTimeMachine.oxw	6913-7162
/code/branches/questsystem/data/levels/theTimeMachine.oxw	1894-2088
/code/branches/questsystem2/data/levels/theTimeMachine.oxw	2107-2259
/code/branches/questsystem5/data/levels/theTimeMachine.oxw	2776-2905
/code/branches/releasetodo/data/levels/theTimeMachine.oxw	7614-7647
/code/branches/resource/data/levels/theTimeMachine.oxw	3327-3366
/code/branches/resource2/data/levels/theTimeMachine.oxw	3372-5694
/code/branches/rocket/data/levels/theTimeMachine.oxw	6523-6950
/code/branches/rocket2/data/levels/theTimeMachine.oxw	6953-6970
/code/branches/script_trigger/data/levels/theTimeMachine.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/theTimeMachine.oxw	6559-6989
/code/branches/sound/data/levels/theTimeMachine.oxw	2829-3010
/code/branches/sound3/data/levels/theTimeMachine.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/theTimeMachine.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/theTimeMachine.oxw	8460-8613
/code/branches/spacerace/data/levels/theTimeMachine.oxw	8182-8630
/code/branches/steering/data/levels/theTimeMachine.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/theTimeMachine.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/theTimeMachine.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/theTimeMachine.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/theTimeMachine.oxw	8453-8636
/code/branches/unity_build/data/levels/theTimeMachine.oxw	8440-8716
/code/branches/weapon/data/levels/theTimeMachine.oxw	1925-2094
/code/branches/weapon2/data/levels/theTimeMachine.oxw	2107-2488
/code/branches/weapons/data/levels/theTimeMachine.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/theTimeMachine.oxw	2742-2890

code/branches/presentation2012/data/levels/tutorial.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/tutorial.oxw	merged	eligible
/code/branches/environment3/data/levels/tutorial.oxw	merged	eligible
/code/branches/formation/data/levels/tutorial.oxw	merged	eligible
/code/branches/gamecontent/data/levels/tutorial.oxw	merged	eligible
/code/branches/hud/data/levels/tutorial.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/tutorial.oxw	merged	eligible
/code/branches/menue/data/levels/tutorial.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/tutorial.oxw	merged	eligible
/code/branches/output/data/levels/tutorial.oxw	merged	eligible
/code/branches/pickup2012/data/levels/tutorial.oxw	merged	eligible
/code/branches/presentation/data/levels/tutorial.oxw	merged	eligible
/code/branches/presentation2011/data/levels/tutorial.oxw	merged	eligible
/code/branches/shipSelection/data/levels/tutorial.oxw	merged	eligible
/code/branches/sound2012/data/levels/tutorial.oxw	merged	eligible
/code/branches/spacegate/data/levels/tutorial.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/tutorial.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/tutorial.oxw	merged	eligible
/code/branches/usability/data/levels/tutorial.oxw	merged	eligible
/code/trunk/data/levels/tutorial.oxw	merged	eligible
/code/branches/ai/data/levels/tutorial.oxw	6592-7033
/code/branches/ai2/data/levels/tutorial.oxw	8721-8880
/code/branches/bigships/data/levels/tutorial.oxw	8137-8588
/code/branches/buildsystem/data/levels/tutorial.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/tutorial.oxw	2506-2658
/code/branches/buildsystem3/data/levels/tutorial.oxw	2662-2708
/code/branches/ceguilua/data/levels/tutorial.oxw	1802-1808
/code/branches/chat/data/levels/tutorial.oxw	6527-6797
/code/branches/chat2/data/levels/tutorial.oxw	6836-6910
/code/branches/console/data/levels/tutorial.oxw	5941-6104
/code/branches/consolecommands2/data/levels/tutorial.oxw	6451-7178
/code/branches/consolecommands3/data/levels/tutorial.oxw	7178-7283
/code/branches/core3/data/levels/tutorial.oxw	1572-1739
/code/branches/core4/data/levels/tutorial.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/tutorial.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/tutorial.oxw	7537-7686
/code/branches/doc/data/levels/tutorial.oxw	7290-7400
/code/branches/dockingsystem/data/levels/tutorial.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/tutorial.oxw	6584-7030
/code/branches/fps/data/levels/tutorial.oxw	6591-7072
/code/branches/gameimmersion/data/levels/tutorial.oxw	8102-8577
/code/branches/gamestate/data/levels/tutorial.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/tutorial.oxw	6594-6745
/code/branches/gametypes/data/levels/tutorial.oxw	2826-3031
/code/branches/gcc43/data/levels/tutorial.oxw	1580
/code/branches/gui/data/levels/tutorial.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/tutorial.oxw	6584-6941
/code/branches/hudimprovements/data/levels/tutorial.oxw	7920-8672
/code/branches/ingamemenu/data/levels/tutorial.oxw	6000-6023
/code/branches/input/data/levels/tutorial.oxw	1629-1636
/code/branches/ipv6/data/levels/tutorial.oxw	7293-7458
/code/branches/kicklib/data/levels/tutorial.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/tutorial.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/tutorial.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/tutorial.oxw	7903-8175
/code/branches/libraries/data/levels/tutorial.oxw	5612-5692
/code/branches/libraries2/data/levels/tutorial.oxw	5703-5737
/code/branches/lod/data/levels/tutorial.oxw	6586-6911
/code/branches/lodfinal/data/levels/tutorial.oxw	2372-2411
/code/branches/mac_osx/data/levels/tutorial.oxw	7789-8128,8135
/code/branches/map/data/levels/tutorial.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/tutorial.oxw	7502-7738
/code/branches/menu/data/levels/tutorial.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/tutorial.oxw	2754-2824
/code/branches/netp2/data/levels/tutorial.oxw	2835-2988
/code/branches/netp3/data/levels/tutorial.oxw	2988-3082
/code/branches/netp6/data/levels/tutorial.oxw	3214-3302
/code/branches/network/data/levels/tutorial.oxw	2356
/code/branches/network2/data/levels/tutorial.oxw	6434-6465
/code/branches/network3/data/levels/tutorial.oxw	7196-7344
/code/branches/network4/data/levels/tutorial.oxw	7497-7755
/code/branches/network5/data/levels/tutorial.oxw	7757-7781
/code/branches/network6/data/levels/tutorial.oxw	7823-8315
/code/branches/network64/data/levels/tutorial.oxw	2210-2355
/code/branches/notifications/data/levels/tutorial.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/tutorial.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/tutorial.oxw	2171-2479
/code/branches/ois_update/data/levels/tutorial.oxw	7506-7788
/code/branches/overlay/data/levels/tutorial.oxw	2117-2385
/code/branches/particles/data/levels/tutorial.oxw	2829-3085
/code/branches/particles2/data/levels/tutorial.oxw	6050-6106,6109
/code/branches/pch/data/levels/tutorial.oxw	3113-3194
/code/branches/physics/data/levels/tutorial.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/tutorial.oxw	2436-2457
/code/branches/pickup/data/levels/tutorial.oxw	8145-8555
/code/branches/pickup2/data/levels/tutorial.oxw	5942-6405
/code/branches/pickup3/data/levels/tutorial.oxw	6418-6523
/code/branches/pickup4/data/levels/tutorial.oxw	6594-6710
/code/branches/pickups/data/levels/tutorial.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/tutorial.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/tutorial.oxw	7262-7263
/code/branches/portals/data/levels/tutorial.oxw	8087-8455
/code/branches/portals2/data/levels/tutorial.oxw	8460-8602
/code/branches/ppspickups1/data/levels/tutorial.oxw	6552-6708
/code/branches/ppspickups2/data/levels/tutorial.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/tutorial.oxw	6757-6997
/code/branches/ppspickups4/data/levels/tutorial.oxw	7003-7089
/code/branches/presentation2/data/levels/tutorial.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/tutorial.oxw	6913-7162
/code/branches/questsystem/data/levels/tutorial.oxw	1894-2088
/code/branches/questsystem2/data/levels/tutorial.oxw	2107-2259
/code/branches/questsystem5/data/levels/tutorial.oxw	2776-2905
/code/branches/releasetodo/data/levels/tutorial.oxw	7614-7647
/code/branches/resource/data/levels/tutorial.oxw	3327-3366
/code/branches/resource2/data/levels/tutorial.oxw	3372-5694
/code/branches/rocket/data/levels/tutorial.oxw	6523-6950
/code/branches/rocket2/data/levels/tutorial.oxw	6953-6970
/code/branches/script_trigger/data/levels/tutorial.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/tutorial.oxw	6559-6989
/code/branches/sound/data/levels/tutorial.oxw	2829-3010
/code/branches/sound3/data/levels/tutorial.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/tutorial.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/tutorial.oxw	8460-8613
/code/branches/spacerace/data/levels/tutorial.oxw	8182-8630
/code/branches/steering/data/levels/tutorial.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/tutorial.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/tutorial.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/tutorial.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/tutorial.oxw	8453-8636
/code/branches/unity_build/data/levels/tutorial.oxw	8440-8716
/code/branches/weapon/data/levels/tutorial.oxw	1925-2094
/code/branches/weapon2/data/levels/tutorial.oxw	2107-2488
/code/branches/weapons/data/levels/tutorial.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/tutorial.oxw	2742-2890

code/branches/presentation2012/data/levels/underAttack.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/underAttack.oxw	merged	eligible
/code/branches/environment3/data/levels/underAttack.oxw	merged	eligible
/code/branches/formation/data/levels/underAttack.oxw	merged	eligible
/code/branches/gamecontent/data/levels/underAttack.oxw	merged	eligible
/code/branches/hud/data/levels/underAttack.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/underAttack.oxw	merged	eligible
/code/branches/menue/data/levels/underAttack.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/underAttack.oxw	merged	eligible
/code/branches/output/data/levels/underAttack.oxw	merged	eligible
/code/branches/pickup2012/data/levels/underAttack.oxw	merged	eligible
/code/branches/presentation/data/levels/underAttack.oxw	merged	eligible
/code/branches/presentation2011/data/levels/underAttack.oxw	merged	eligible
/code/branches/shipSelection/data/levels/underAttack.oxw	merged	eligible
/code/branches/sound2012/data/levels/underAttack.oxw	merged	eligible
/code/branches/spacegate/data/levels/underAttack.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/underAttack.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/underAttack.oxw	merged	eligible
/code/branches/usability/data/levels/underAttack.oxw	merged	eligible
/code/trunk/data/levels/underAttack.oxw	merged	eligible
/code/branches/ai/data/levels/underAttack.oxw	6592-7033
/code/branches/ai2/data/levels/underAttack.oxw	8721-8880
/code/branches/bigships/data/levels/underAttack.oxw	8137-8588
/code/branches/buildsystem/data/levels/underAttack.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/underAttack.oxw	2506-2658
/code/branches/buildsystem3/data/levels/underAttack.oxw	2662-2708
/code/branches/ceguilua/data/levels/underAttack.oxw	1802-1808
/code/branches/chat/data/levels/underAttack.oxw	6527-6797
/code/branches/chat2/data/levels/underAttack.oxw	6836-6910
/code/branches/console/data/levels/underAttack.oxw	5941-6104
/code/branches/consolecommands2/data/levels/underAttack.oxw	6451-7178
/code/branches/consolecommands3/data/levels/underAttack.oxw	7178-7283
/code/branches/core3/data/levels/underAttack.oxw	1572-1739
/code/branches/core4/data/levels/underAttack.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/underAttack.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/underAttack.oxw	7537-7686
/code/branches/doc/data/levels/underAttack.oxw	7290-7400
/code/branches/dockingsystem/data/levels/underAttack.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/underAttack.oxw	6584-7030
/code/branches/fps/data/levels/underAttack.oxw	6591-7072
/code/branches/gameimmersion/data/levels/underAttack.oxw	8102-8577
/code/branches/gamestate/data/levels/underAttack.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/underAttack.oxw	6594-6745
/code/branches/gametypes/data/levels/underAttack.oxw	2826-3031
/code/branches/gcc43/data/levels/underAttack.oxw	1580
/code/branches/gui/data/levels/underAttack.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/underAttack.oxw	6584-6941
/code/branches/hudimprovements/data/levels/underAttack.oxw	7920-8672
/code/branches/ingamemenu/data/levels/underAttack.oxw	6000-6023
/code/branches/input/data/levels/underAttack.oxw	1629-1636
/code/branches/ipv6/data/levels/underAttack.oxw	7293-7458
/code/branches/kicklib/data/levels/underAttack.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/underAttack.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/underAttack.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/underAttack.oxw	7903-8175
/code/branches/libraries/data/levels/underAttack.oxw	5612-5692
/code/branches/libraries2/data/levels/underAttack.oxw	5703-5737
/code/branches/lod/data/levels/underAttack.oxw	6586-6911
/code/branches/lodfinal/data/levels/underAttack.oxw	2372-2411
/code/branches/mac_osx/data/levels/underAttack.oxw	7789-8128,8135
/code/branches/map/data/levels/underAttack.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/underAttack.oxw	7502-7738
/code/branches/menu/data/levels/underAttack.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/underAttack.oxw	2754-2824
/code/branches/netp2/data/levels/underAttack.oxw	2835-2988
/code/branches/netp3/data/levels/underAttack.oxw	2988-3082
/code/branches/netp6/data/levels/underAttack.oxw	3214-3302
/code/branches/network/data/levels/underAttack.oxw	2356
/code/branches/network2/data/levels/underAttack.oxw	6434-6465
/code/branches/network3/data/levels/underAttack.oxw	7196-7344
/code/branches/network4/data/levels/underAttack.oxw	7497-7755
/code/branches/network5/data/levels/underAttack.oxw	7757-7781
/code/branches/network6/data/levels/underAttack.oxw	7823-8315
/code/branches/network64/data/levels/underAttack.oxw	2210-2355
/code/branches/notifications/data/levels/underAttack.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/underAttack.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/underAttack.oxw	2171-2479
/code/branches/ois_update/data/levels/underAttack.oxw	7506-7788
/code/branches/overlay/data/levels/underAttack.oxw	2117-2385
/code/branches/particles/data/levels/underAttack.oxw	2829-3085
/code/branches/particles2/data/levels/underAttack.oxw	6050-6106,6109
/code/branches/pch/data/levels/underAttack.oxw	3113-3194
/code/branches/physics/data/levels/underAttack.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/underAttack.oxw	2436-2457
/code/branches/pickup/data/levels/underAttack.oxw	8145-8555
/code/branches/pickup2/data/levels/underAttack.oxw	5942-6405
/code/branches/pickup3/data/levels/underAttack.oxw	6418-6523
/code/branches/pickup4/data/levels/underAttack.oxw	6594-6710
/code/branches/pickups/data/levels/underAttack.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/underAttack.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/underAttack.oxw	7262-7263
/code/branches/portals/data/levels/underAttack.oxw	8087-8455
/code/branches/portals2/data/levels/underAttack.oxw	8460-8602
/code/branches/ppspickups1/data/levels/underAttack.oxw	6552-6708
/code/branches/ppspickups2/data/levels/underAttack.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/underAttack.oxw	6757-6997
/code/branches/ppspickups4/data/levels/underAttack.oxw	7003-7089
/code/branches/presentation2/data/levels/underAttack.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/underAttack.oxw	6913-7162
/code/branches/questsystem/data/levels/underAttack.oxw	1894-2088
/code/branches/questsystem2/data/levels/underAttack.oxw	2107-2259
/code/branches/questsystem5/data/levels/underAttack.oxw	2776-2905
/code/branches/releasetodo/data/levels/underAttack.oxw	7614-7647
/code/branches/resource/data/levels/underAttack.oxw	3327-3366
/code/branches/resource2/data/levels/underAttack.oxw	3372-5694
/code/branches/rocket/data/levels/underAttack.oxw	6523-6950
/code/branches/rocket2/data/levels/underAttack.oxw	6953-6970
/code/branches/script_trigger/data/levels/underAttack.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/underAttack.oxw	6559-6989
/code/branches/sound/data/levels/underAttack.oxw	2829-3010
/code/branches/sound3/data/levels/underAttack.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/underAttack.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/underAttack.oxw	8460-8613
/code/branches/spacerace/data/levels/underAttack.oxw	8182-8630
/code/branches/steering/data/levels/underAttack.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/underAttack.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/underAttack.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/underAttack.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/underAttack.oxw	8453-8636
/code/branches/unity_build/data/levels/underAttack.oxw	8440-8716
/code/branches/weapon/data/levels/underAttack.oxw	1925-2094
/code/branches/weapon2/data/levels/underAttack.oxw	2107-2488
/code/branches/weapons/data/levels/underAttack.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/underAttack.oxw	2742-2890

code/branches/presentation2012/data/levels/waypoints.oxw

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/levels/waypoints.oxw	merged	eligible
/code/branches/environment3/data/levels/waypoints.oxw	merged	eligible
/code/branches/formation/data/levels/waypoints.oxw	merged	eligible
/code/branches/gamecontent/data/levels/waypoints.oxw	merged	eligible
/code/branches/hud/data/levels/waypoints.oxw	merged	eligible
/code/branches/masterserverfix/data/levels/waypoints.oxw	merged	eligible
/code/branches/menue/data/levels/waypoints.oxw	merged	eligible
/code/branches/newlevel2012/data/levels/waypoints.oxw	merged	eligible
/code/branches/output/data/levels/waypoints.oxw	merged	eligible
/code/branches/pickup2012/data/levels/waypoints.oxw	merged	eligible
/code/branches/presentation/data/levels/waypoints.oxw	merged	eligible
/code/branches/presentation2011/data/levels/waypoints.oxw	merged	eligible
/code/branches/shipSelection/data/levels/waypoints.oxw	merged	eligible
/code/branches/sound2012/data/levels/waypoints.oxw	merged	eligible
/code/branches/spacegate/data/levels/waypoints.oxw	merged	eligible
/code/branches/spaceraceTwo/data/levels/waypoints.oxw	merged	eligible
/code/branches/surfaceRace/data/levels/waypoints.oxw	merged	eligible
/code/branches/usability/data/levels/waypoints.oxw	merged	eligible
/code/trunk/data/levels/waypoints.oxw	merged	eligible
/code/branches/ai/data/levels/waypoints.oxw	6592-7033
/code/branches/ai2/data/levels/waypoints.oxw	8721-8880
/code/branches/bigships/data/levels/waypoints.oxw	8137-8588
/code/branches/buildsystem/data/levels/waypoints.oxw	1874-2276,2278-2400
/code/branches/buildsystem2/data/levels/waypoints.oxw	2506-2658
/code/branches/buildsystem3/data/levels/waypoints.oxw	2662-2708
/code/branches/ceguilua/data/levels/waypoints.oxw	1802-1808
/code/branches/chat/data/levels/waypoints.oxw	6527-6797
/code/branches/chat2/data/levels/waypoints.oxw	6836-6910
/code/branches/console/data/levels/waypoints.oxw	5941-6104
/code/branches/consolecommands2/data/levels/waypoints.oxw	6451-7178
/code/branches/consolecommands3/data/levels/waypoints.oxw	7178-7283
/code/branches/core3/data/levels/waypoints.oxw	1572-1739
/code/branches/core4/data/levels/waypoints.oxw	3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5/data/levels/waypoints.oxw	5768-5928,6009
/code/branches/data_cleanup/data/levels/waypoints.oxw	7537-7686
/code/branches/doc/data/levels/waypoints.oxw	7290-7400
/code/branches/dockingsystem/data/levels/waypoints.oxw	8101-8192
/code/branches/dynamicmatch/data/levels/waypoints.oxw	6584-7030
/code/branches/fps/data/levels/waypoints.oxw	6591-7072
/code/branches/gameimmersion/data/levels/waypoints.oxw	8102-8577
/code/branches/gamestate/data/levels/waypoints.oxw	6430-6572,6621-6661
/code/branches/gamestates2/data/levels/waypoints.oxw	6594-6745
/code/branches/gametypes/data/levels/waypoints.oxw	2826-3031
/code/branches/gcc43/data/levels/waypoints.oxw	1580
/code/branches/gui/data/levels/waypoints.oxw	1635-1723,2795-2894
/code/branches/hudelements/data/levels/waypoints.oxw	6584-6941
/code/branches/hudimprovements/data/levels/waypoints.oxw	7920-8672
/code/branches/ingamemenu/data/levels/waypoints.oxw	6000-6023
/code/branches/input/data/levels/waypoints.oxw	1629-1636
/code/branches/ipv6/data/levels/waypoints.oxw	7293-7458
/code/branches/kicklib/data/levels/waypoints.oxw	7940-8096,8098-8277
/code/branches/kicklib2/data/levels/waypoints.oxw	8282-8350
/code/branches/lastmanstanding/data/levels/waypoints.oxw	7479-7644
/code/branches/lastmanstanding3/data/levels/waypoints.oxw	7903-8175
/code/branches/libraries/data/levels/waypoints.oxw	5612-5692
/code/branches/libraries2/data/levels/waypoints.oxw	5703-5737
/code/branches/lod/data/levels/waypoints.oxw	6586-6911
/code/branches/lodfinal/data/levels/waypoints.oxw	2372-2411
/code/branches/mac_osx/data/levels/waypoints.oxw	7789-8128,8135
/code/branches/map/data/levels/waypoints.oxw	2801-3086,3089
/code/branches/masterserver/data/levels/waypoints.oxw	7502-7738
/code/branches/menu/data/levels/waypoints.oxw	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/levels/waypoints.oxw	2754-2824
/code/branches/netp2/data/levels/waypoints.oxw	2835-2988
/code/branches/netp3/data/levels/waypoints.oxw	2988-3082
/code/branches/netp6/data/levels/waypoints.oxw	3214-3302
/code/branches/network/data/levels/waypoints.oxw	2356
/code/branches/network2/data/levels/waypoints.oxw	6434-6465
/code/branches/network3/data/levels/waypoints.oxw	7196-7344
/code/branches/network4/data/levels/waypoints.oxw	7497-7755
/code/branches/network5/data/levels/waypoints.oxw	7757-7781
/code/branches/network6/data/levels/waypoints.oxw	7823-8315
/code/branches/network64/data/levels/waypoints.oxw	2210-2355
/code/branches/notifications/data/levels/waypoints.oxw	7314-7401
/code/branches/objecthierarchy/data/levels/waypoints.oxw	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/levels/waypoints.oxw	2171-2479
/code/branches/ois_update/data/levels/waypoints.oxw	7506-7788
/code/branches/overlay/data/levels/waypoints.oxw	2117-2385
/code/branches/particles/data/levels/waypoints.oxw	2829-3085
/code/branches/particles2/data/levels/waypoints.oxw	6050-6106,6109
/code/branches/pch/data/levels/waypoints.oxw	3113-3194
/code/branches/physics/data/levels/waypoints.oxw	1912-2055,2107-2439
/code/branches/physics_merge/data/levels/waypoints.oxw	2436-2457
/code/branches/pickup/data/levels/waypoints.oxw	8145-8555
/code/branches/pickup2/data/levels/waypoints.oxw	5942-6405
/code/branches/pickup3/data/levels/waypoints.oxw	6418-6523
/code/branches/pickup4/data/levels/waypoints.oxw	6594-6710
/code/branches/pickups/data/levels/waypoints.oxw	1926-2086,2127,2827-2915
/code/branches/pickups2/data/levels/waypoints.oxw	2107-2497,2915-3071
/code/branches/png2/data/levels/waypoints.oxw	7262-7263
/code/branches/portals/data/levels/waypoints.oxw	8087-8455
/code/branches/portals2/data/levels/waypoints.oxw	8460-8602
/code/branches/ppspickups1/data/levels/waypoints.oxw	6552-6708
/code/branches/ppspickups2/data/levels/waypoints.oxw	6527-6532,6554-6709
/code/branches/ppspickups3/data/levels/waypoints.oxw	6757-6997
/code/branches/ppspickups4/data/levels/waypoints.oxw	7003-7089
/code/branches/presentation2/data/levels/waypoints.oxw	6106-6416,7787-7800
/code/branches/presentation3/data/levels/waypoints.oxw	6913-7162
/code/branches/questsystem/data/levels/waypoints.oxw	1894-2088
/code/branches/questsystem2/data/levels/waypoints.oxw	2107-2259
/code/branches/questsystem5/data/levels/waypoints.oxw	2776-2905
/code/branches/releasetodo/data/levels/waypoints.oxw	7614-7647
/code/branches/resource/data/levels/waypoints.oxw	3327-3366
/code/branches/resource2/data/levels/waypoints.oxw	3372-5694
/code/branches/rocket/data/levels/waypoints.oxw	6523-6950
/code/branches/rocket2/data/levels/waypoints.oxw	6953-6970
/code/branches/script_trigger/data/levels/waypoints.oxw	1295-1953,1955
/code/branches/skybox2/data/levels/waypoints.oxw	6559-6989
/code/branches/sound/data/levels/waypoints.oxw	2829-3010
/code/branches/sound3/data/levels/waypoints.oxw	5941-6102
/code/branches/spaceboundaries/data/levels/waypoints.oxw	8085-8457
/code/branches/spaceboundaries2/data/levels/waypoints.oxw	8460-8613
/code/branches/spacerace/data/levels/waypoints.oxw	8182-8630
/code/branches/steering/data/levels/waypoints.oxw	5949-6091,8140-8595
/code/branches/tetris/data/levels/waypoints.oxw	8100-8563
/code/branches/tutoriallevel/data/levels/waypoints.oxw	7827-8370
/code/branches/tutoriallevel2/data/levels/waypoints.oxw	8370-8452
/code/branches/tutoriallevel3/data/levels/waypoints.oxw	8453-8636
/code/branches/unity_build/data/levels/waypoints.oxw	8440-8716
/code/branches/weapon/data/levels/waypoints.oxw	1925-2094
/code/branches/weapon2/data/levels/waypoints.oxw	2107-2488
/code/branches/weapons/data/levels/waypoints.oxw	2897-3051,8143-8591
/code/branches/weaponsystem/data/levels/waypoints.oxw	2742-2890

code/branches/presentation2012/data/overlays

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/overlays	merged	eligible
/code/branches/environment3/data/overlays	merged	eligible
/code/branches/formation/data/overlays	merged	eligible
/code/branches/gamecontent/data/overlays	merged	eligible
/code/branches/hud/data/overlays	merged	eligible
/code/branches/masterserverfix/data/overlays	merged	eligible
/code/branches/menue/data/overlays	merged	eligible
/code/branches/newlevel2012/data/overlays	merged	eligible
/code/branches/output/data/overlays	merged	eligible
/code/branches/pickup2012/data/overlays	merged	eligible
/code/branches/presentation/data/overlays	merged	eligible
/code/branches/presentation2011/data/overlays	merged	eligible
/code/branches/shipSelection/data/overlays	merged	eligible
/code/branches/sound2012/data/overlays	merged	non-inheritable	eligible
/code/branches/spacegate/data/overlays	merged	eligible
/code/branches/spaceraceTwo/data/overlays	merged	eligible
/code/branches/surfaceRace/data/overlays	merged	eligible
/code/branches/usability/data/overlays	merged	eligible
/code/trunk/data/overlays	merged	eligible
/code/branches/ai/data/overlays	6592-7033
/code/branches/ai2/data/overlays	8721-8880
/code/branches/bigships/data/overlays	8137-8588
/code/branches/buildsystem/data/overlays	1874-2276,2278-2400
/code/branches/buildsystem2/data/overlays	2506-2658
/code/branches/buildsystem3/data/overlays	2662-2708
/code/branches/ceguilua/data/overlays	1802-1808
/code/branches/chat/data/overlays	6527-6797
/code/branches/chat2/data/overlays	6836-6910
/code/branches/console/data/overlays	5941-6104
/code/branches/consolecommands2/data/overlays	6451-7178
/code/branches/consolecommands3/data/overlays	7178-7283
/code/branches/core3/data/overlays	1572-1739
/code/branches/core4/data/overlays	3221-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	5768-5928,6009
/code/branches/data_cleanup/data/overlays	7537-7686
/code/branches/doc/data/overlays	7290-7400
/code/branches/dockingsystem/data/overlays	8101-8192
/code/branches/dynamicmatch/data/overlays	6584-7030
/code/branches/fps/data/overlays	6591-7072
/code/branches/gameimmersion/data/overlays	8102-8577
/code/branches/gamestate/data/overlays	6430-6572,6621-6661
/code/branches/gamestates2/data/overlays	6594-6745
/code/branches/gametypes/data/overlays	2826-3031
/code/branches/gcc43/data/overlays	1580
/code/branches/gui/data/overlays	1635-1723,2795-2894
/code/branches/hudelements/data/overlays	6584-6941
/code/branches/hudimprovements/data/overlays	7920-8672
/code/branches/ingamemenu/data/overlays	6000-6023
/code/branches/input/data/overlays	1629-1636
/code/branches/ipv6/data/overlays	7293-7458
/code/branches/kicklib/data/overlays	7940-8096,8098-8277
/code/branches/kicklib2/data/overlays	8282-8350
/code/branches/lastmanstanding/data/overlays	7479-7644
/code/branches/lastmanstanding3/data/overlays	7903-8175
/code/branches/libraries/data/overlays	5612-5692
/code/branches/libraries2/data/overlays	5703-5737
/code/branches/lod/data/overlays	6586-6911
/code/branches/lodfinal/data/overlays	2372-2411
/code/branches/mac_osx/data/overlays	7789-8128,8135
/code/branches/map/data/overlays	2801-3086,3089
/code/branches/masterserver/data/overlays	7502-7738
/code/branches/menu/data/overlays	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/overlays	2754-2824
/code/branches/netp2/data/overlays	2835-2988
/code/branches/netp3/data/overlays	2988-3082
/code/branches/netp6/data/overlays	3214-3302
/code/branches/network/data/overlays	2356
/code/branches/network2/data/overlays	6434-6465
/code/branches/network3/data/overlays	7196-7344
/code/branches/network4/data/overlays	7497-7755
/code/branches/network5/data/overlays	7757-7781
/code/branches/network6/data/overlays	7823-8315
/code/branches/network64/data/overlays	2210-2355
/code/branches/notifications/data/overlays	7314-7401
/code/branches/objecthierarchy/data/overlays	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/overlays	2171-2479
/code/branches/ois_update/data/overlays	7506-7788
/code/branches/overlay/data/overlays	2117-2385
/code/branches/particles/data/overlays	2829-3085
/code/branches/particles2/data/overlays	6050-6106,6109
/code/branches/pch/data/overlays	3113-3194
/code/branches/physics/data/overlays	1912-2055,2107-2439
/code/branches/physics_merge/data/overlays	2436-2457
/code/branches/pickup/data/overlays	8145-8555
/code/branches/pickup2/data/overlays	5942-6405
/code/branches/pickup3/data/overlays	6418-6523
/code/branches/pickup4/data/overlays	6594-6710
/code/branches/pickups/data/overlays	1926-2086,2127,2827-2915
/code/branches/pickups2/data/overlays	2107-2497,2915-3071
/code/branches/png2/data/overlays	7262-7263
/code/branches/portals/data/overlays	8087-8455
/code/branches/portals2/data/overlays	8460-8602
/code/branches/ppspickups1/data/overlays	6552-6708
/code/branches/ppspickups2/data/overlays	6527-6532,6554-6709
/code/branches/ppspickups3/data/overlays	6757-6997
/code/branches/ppspickups4/data/overlays	7003-7089
/code/branches/presentation2/data/overlays	6106-6416,7787-7800
/code/branches/presentation3/data/overlays	6913-7162
/code/branches/questsystem/data/overlays	1894-2088
/code/branches/questsystem2/data/overlays	2107-2259
/code/branches/questsystem5/data/overlays	2776-2905
/code/branches/releasetodo/data/overlays	7614-7647
/code/branches/resource/data/overlays	3327-3366
/code/branches/resource2/data/overlays	3372-5694
/code/branches/rocket/data/overlays	6523-6950
/code/branches/rocket2/data/overlays	6953-6970
/code/branches/script_trigger/data/overlays	1295-1953,1955
/code/branches/skybox2/data/overlays	6559-6989
/code/branches/sound/data/overlays	2829-3010
/code/branches/sound3/data/overlays	5941-6102
/code/branches/spaceboundaries/data/overlays	8085-8457
/code/branches/spaceboundaries2/data/overlays	8460-8613
/code/branches/spacerace/data/overlays	8182-8630
/code/branches/steering/data/overlays	5949-6091,8140-8595
/code/branches/tetris/data/overlays	8100-8563
/code/branches/tutoriallevel/data/overlays	7827-8370
/code/branches/tutoriallevel2/data/overlays	8370-8452
/code/branches/tutoriallevel3/data/overlays	8453-8636
/code/branches/unity_build/data/overlays	8440-8716
/code/branches/weapon/data/overlays	1925-2094
/code/branches/weapon2/data/overlays	2107-2488
/code/branches/weapons/data/overlays	2897-3051,8143-8591
/code/branches/weaponsystem/data/overlays	2742-2890

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

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/overlays/HUD.oxo	merged	eligible
/code/branches/environment3/data/overlays/HUD.oxo	merged	eligible
/code/branches/formation/data/overlays/HUD.oxo	merged	eligible
/code/branches/gamecontent/data/overlays/HUD.oxo	merged	eligible
/code/branches/hud/data/overlays/HUD.oxo	merged	eligible
/code/branches/masterserverfix/data/overlays/HUD.oxo	merged	eligible
/code/branches/menue/data/overlays/HUD.oxo	merged	eligible
/code/branches/newlevel2012/data/overlays/HUD.oxo	merged	eligible
/code/branches/output/data/overlays/HUD.oxo	merged	eligible
/code/branches/pickup2012/data/overlays/HUD.oxo	merged	eligible
/code/branches/presentation/data/overlays/HUD.oxo	merged	eligible
/code/branches/presentation2011/data/overlays/HUD.oxo	merged	eligible
/code/branches/shipSelection/data/overlays/HUD.oxo	merged	eligible
/code/branches/sound2012/data/overlays/HUD.oxo	merged	eligible
/code/branches/spacegate/data/overlays/HUD.oxo	merged	eligible
/code/branches/spaceraceTwo/data/overlays/HUD.oxo	merged	eligible
/code/branches/surfaceRace/data/overlays/HUD.oxo	merged	eligible
/code/branches/usability/data/overlays/HUD.oxo	merged	eligible
/code/trunk/data/overlays/HUD.oxo	merged	eligible
/code/branches/ai/data/overlays/HUD.oxo	6592-7033
/code/branches/ai2/data/overlays/HUD.oxo	8721-8880
/code/branches/bigships/data/overlays/HUD.oxo	8137-8588
/code/branches/buildsystem/data/overlays/HUD.oxo	1874-2276,2278-2400
/code/branches/buildsystem2/data/overlays/HUD.oxo	2506-2658
/code/branches/buildsystem3/data/overlays/HUD.oxo	2662-2708
/code/branches/ceguilua/data/overlays/HUD.oxo	1802-1808
/code/branches/chat/data/overlays/HUD.oxo	6527-6797
/code/branches/chat2/data/overlays/HUD.oxo	6836-6910
/code/branches/console/data/overlays/HUD.oxo	5941-6104
/code/branches/consolecommands2/data/overlays/HUD.oxo	6451-7178
/code/branches/consolecommands3/data/overlays/HUD.oxo	7178-7283
/code/branches/core3/data/overlays/HUD.oxo	1572-1739
/code/branches/core4/data/overlays/HUD.oxo	3221-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.oxo	5768-5928,6009
/code/branches/data_cleanup/data/overlays/HUD.oxo	7537-7686
/code/branches/doc/data/overlays/HUD.oxo	7290-7400
/code/branches/dockingsystem/data/overlays/HUD.oxo	8101-8192
/code/branches/dynamicmatch/data/overlays/HUD.oxo	6584-7030
/code/branches/fps/data/overlays/HUD.oxo	6591-7072
/code/branches/gameimmersion/data/overlays/HUD.oxo	8102-8577
/code/branches/gamestate/data/overlays/HUD.oxo	6430-6572,6621-6661
/code/branches/gamestates2/data/overlays/HUD.oxo	6594-6745
/code/branches/gametypes/data/overlays/HUD.oxo	2826-3031
/code/branches/gcc43/data/overlays/HUD.oxo	1580
/code/branches/gui/data/overlays/HUD.oxo	1635-1723,2795-2894
/code/branches/hudelements/data/overlays/HUD.oxo	6584-6941
/code/branches/hudimprovements/data/overlays/HUD.oxo	7920-8672
/code/branches/ingamemenu/data/overlays/HUD.oxo	6000-6023
/code/branches/input/data/overlays/HUD.oxo	1629-1636
/code/branches/ipv6/data/overlays/HUD.oxo	7293-7458
/code/branches/kicklib/data/overlays/HUD.oxo	7940-8096,8098-8277
/code/branches/kicklib2/data/overlays/HUD.oxo	8282-8350
/code/branches/lastmanstanding/data/overlays/HUD.oxo	7479-7644
/code/branches/lastmanstanding3/data/overlays/HUD.oxo	7903-8175
/code/branches/libraries/data/overlays/HUD.oxo	5612-5692
/code/branches/libraries2/data/overlays/HUD.oxo	5703-5737
/code/branches/lod/data/overlays/HUD.oxo	6586-6911
/code/branches/lodfinal/data/overlays/HUD.oxo	2372-2411
/code/branches/mac_osx/data/overlays/HUD.oxo	7789-8128,8135
/code/branches/map/data/overlays/HUD.oxo	2801-3086,3089
/code/branches/masterserver/data/overlays/HUD.oxo	7502-7738
/code/branches/menu/data/overlays/HUD.oxo	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/overlays/HUD.oxo	2754-2824
/code/branches/netp2/data/overlays/HUD.oxo	2835-2988
/code/branches/netp3/data/overlays/HUD.oxo	2988-3082
/code/branches/netp6/data/overlays/HUD.oxo	3214-3302
/code/branches/network/data/overlays/HUD.oxo	2356
/code/branches/network2/data/overlays/HUD.oxo	6434-6465
/code/branches/network3/data/overlays/HUD.oxo	7196-7344
/code/branches/network4/data/overlays/HUD.oxo	7497-7755
/code/branches/network5/data/overlays/HUD.oxo	7757-7781
/code/branches/network6/data/overlays/HUD.oxo	7823-8315
/code/branches/network64/data/overlays/HUD.oxo	2210-2355
/code/branches/notifications/data/overlays/HUD.oxo	7314-7401
/code/branches/objecthierarchy/data/overlays/HUD.oxo	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/overlays/HUD.oxo	2171-2479
/code/branches/ois_update/data/overlays/HUD.oxo	7506-7788
/code/branches/overlay/data/overlays/HUD.oxo	2117-2385
/code/branches/particles/data/overlays/HUD.oxo	2829-3085
/code/branches/particles2/data/overlays/HUD.oxo	6050-6106,6109
/code/branches/pch/data/overlays/HUD.oxo	3113-3194
/code/branches/physics/data/overlays/HUD.oxo	1912-2055,2107-2439
/code/branches/physics_merge/data/overlays/HUD.oxo	2436-2457
/code/branches/pickup/data/overlays/HUD.oxo	8145-8555
/code/branches/pickup2/data/overlays/HUD.oxo	5942-6405
/code/branches/pickup3/data/overlays/HUD.oxo	6418-6523
/code/branches/pickup4/data/overlays/HUD.oxo	6594-6710
/code/branches/pickups/data/overlays/HUD.oxo	1926-2086,2127,2827-2915
/code/branches/pickups2/data/overlays/HUD.oxo	2107-2497,2915-3071
/code/branches/png2/data/overlays/HUD.oxo	7262-7263
/code/branches/portals/data/overlays/HUD.oxo	8087-8455
/code/branches/portals2/data/overlays/HUD.oxo	8460-8602
/code/branches/ppspickups1/data/overlays/HUD.oxo	6552-6708
/code/branches/ppspickups2/data/overlays/HUD.oxo	6527-6532,6554-6709
/code/branches/ppspickups3/data/overlays/HUD.oxo	6757-6997
/code/branches/ppspickups4/data/overlays/HUD.oxo	7003-7089
/code/branches/presentation2/data/overlays/HUD.oxo	6106-6416,7787-7800
/code/branches/presentation3/data/overlays/HUD.oxo	6913-7162
/code/branches/questsystem/data/overlays/HUD.oxo	1894-2088
/code/branches/questsystem2/data/overlays/HUD.oxo	2107-2259
/code/branches/questsystem5/data/overlays/HUD.oxo	2776-2905
/code/branches/releasetodo/data/overlays/HUD.oxo	7614-7647
/code/branches/resource/data/overlays/HUD.oxo	3327-3366
/code/branches/resource2/data/overlays/HUD.oxo	3372-5694
/code/branches/rocket/data/overlays/HUD.oxo	6523-6950
/code/branches/rocket2/data/overlays/HUD.oxo	6953-6970
/code/branches/script_trigger/data/overlays/HUD.oxo	1295-1953,1955
/code/branches/skybox2/data/overlays/HUD.oxo	6559-6989
/code/branches/sound/data/overlays/HUD.oxo	2829-3010
/code/branches/sound3/data/overlays/HUD.oxo	5941-6102
/code/branches/spaceboundaries/data/overlays/HUD.oxo	8085-8457
/code/branches/spaceboundaries2/data/overlays/HUD.oxo	8460-8613
/code/branches/spacerace/data/overlays/HUD.oxo	8182-8630
/code/branches/steering/data/overlays/HUD.oxo	5949-6091,8140-8595
/code/branches/tetris/data/overlays/HUD.oxo	8100-8563
/code/branches/tutoriallevel/data/overlays/HUD.oxo	7827-8370
/code/branches/tutoriallevel2/data/overlays/HUD.oxo	8370-8452
/code/branches/tutoriallevel3/data/overlays/HUD.oxo	8453-8636
/code/branches/unity_build/data/overlays/HUD.oxo	8440-8716
/code/branches/weapon/data/overlays/HUD.oxo	1925-2094
/code/branches/weapon2/data/overlays/HUD.oxo	2107-2488
/code/branches/weapons/data/overlays/HUD.oxo	2897-3051,8143-8591
/code/branches/weaponsystem/data/overlays/HUD.oxo	2742-2890

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

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/environment3/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/formation/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/gamecontent/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/hud/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/masterserverfix/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/menue/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/newlevel2012/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/output/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/pickup2012/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/presentation/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/presentation2011/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/shipSelection/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/sound2012/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/spacegate/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/spaceraceTwo/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/surfaceRace/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/usability/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/trunk/data/overlays/HUDTemplates3.oxo	merged	eligible
/code/branches/ai/data/overlays/HUDTemplates3.oxo	6592-7033
/code/branches/ai2/data/overlays/HUDTemplates3.oxo	8721-8880
/code/branches/bigships/data/overlays/HUDTemplates3.oxo	8137-8588
/code/branches/buildsystem/data/overlays/HUDTemplates3.oxo	1874-2276,2278-2400
/code/branches/buildsystem2/data/overlays/HUDTemplates3.oxo	2506-2658
/code/branches/buildsystem3/data/overlays/HUDTemplates3.oxo	2662-2708
/code/branches/ceguilua/data/overlays/HUDTemplates3.oxo	1802-1808
/code/branches/chat/data/overlays/HUDTemplates3.oxo	6527-6797
/code/branches/chat2/data/overlays/HUDTemplates3.oxo	6836-6910
/code/branches/console/data/overlays/HUDTemplates3.oxo	5941-6104
/code/branches/consolecommands2/data/overlays/HUDTemplates3.oxo	6451-7178
/code/branches/consolecommands3/data/overlays/HUDTemplates3.oxo	7178-7283
/code/branches/core3/data/overlays/HUDTemplates3.oxo	1572-1739
/code/branches/core4/data/overlays/HUDTemplates3.oxo	3221-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.oxo	5768-5928,6009
/code/branches/data_cleanup/data/overlays/HUDTemplates3.oxo	7537-7686
/code/branches/doc/data/overlays/HUDTemplates3.oxo	7290-7400
/code/branches/dockingsystem/data/overlays/HUDTemplates3.oxo	8101-8192
/code/branches/dynamicmatch/data/overlays/HUDTemplates3.oxo	6584-7030
/code/branches/fps/data/overlays/HUDTemplates3.oxo	6591-7072
/code/branches/gameimmersion/data/overlays/HUDTemplates3.oxo	8102-8577
/code/branches/gamestate/data/overlays/HUDTemplates3.oxo	6430-6572,6621-6661
/code/branches/gamestates2/data/overlays/HUDTemplates3.oxo	6594-6745
/code/branches/gametypes/data/overlays/HUDTemplates3.oxo	2826-3031
/code/branches/gcc43/data/overlays/HUDTemplates3.oxo	1580
/code/branches/gui/data/overlays/HUDTemplates3.oxo	1635-1723,2795-2894
/code/branches/hudelements/data/overlays/HUDTemplates3.oxo	6584-6941
/code/branches/hudimprovements/data/overlays/HUDTemplates3.oxo	7920-8672
/code/branches/ingamemenu/data/overlays/HUDTemplates3.oxo	6000-6023
/code/branches/input/data/overlays/HUDTemplates3.oxo	1629-1636
/code/branches/ipv6/data/overlays/HUDTemplates3.oxo	7293-7458
/code/branches/kicklib/data/overlays/HUDTemplates3.oxo	7940-8096,8098-8277
/code/branches/kicklib2/data/overlays/HUDTemplates3.oxo	8282-8350
/code/branches/lastmanstanding/data/overlays/HUDTemplates3.oxo	7479-7644
/code/branches/lastmanstanding3/data/overlays/HUDTemplates3.oxo	7903-8175
/code/branches/libraries/data/overlays/HUDTemplates3.oxo	5612-5692
/code/branches/libraries2/data/overlays/HUDTemplates3.oxo	5703-5737
/code/branches/lod/data/overlays/HUDTemplates3.oxo	6586-6911
/code/branches/lodfinal/data/overlays/HUDTemplates3.oxo	2372-2411
/code/branches/mac_osx/data/overlays/HUDTemplates3.oxo	7789-8128,8135
/code/branches/map/data/overlays/HUDTemplates3.oxo	2801-3086,3089
/code/branches/masterserver/data/overlays/HUDTemplates3.oxo	7502-7738
/code/branches/menu/data/overlays/HUDTemplates3.oxo	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/overlays/HUDTemplates3.oxo	2754-2824
/code/branches/netp2/data/overlays/HUDTemplates3.oxo	2835-2988
/code/branches/netp3/data/overlays/HUDTemplates3.oxo	2988-3082
/code/branches/netp6/data/overlays/HUDTemplates3.oxo	3214-3302
/code/branches/network/data/overlays/HUDTemplates3.oxo	2356
/code/branches/network2/data/overlays/HUDTemplates3.oxo	6434-6465
/code/branches/network3/data/overlays/HUDTemplates3.oxo	7196-7344
/code/branches/network4/data/overlays/HUDTemplates3.oxo	7497-7755
/code/branches/network5/data/overlays/HUDTemplates3.oxo	7757-7781
/code/branches/network6/data/overlays/HUDTemplates3.oxo	7823-8315
/code/branches/network64/data/overlays/HUDTemplates3.oxo	2210-2355
/code/branches/notifications/data/overlays/HUDTemplates3.oxo	7314-7401
/code/branches/objecthierarchy/data/overlays/HUDTemplates3.oxo	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/overlays/HUDTemplates3.oxo	2171-2479
/code/branches/ois_update/data/overlays/HUDTemplates3.oxo	7506-7788
/code/branches/overlay/data/overlays/HUDTemplates3.oxo	2117-2385
/code/branches/particles/data/overlays/HUDTemplates3.oxo	2829-3085
/code/branches/particles2/data/overlays/HUDTemplates3.oxo	6050-6106,6109
/code/branches/pch/data/overlays/HUDTemplates3.oxo	3113-3194
/code/branches/physics/data/overlays/HUDTemplates3.oxo	1912-2055,2107-2439
/code/branches/physics_merge/data/overlays/HUDTemplates3.oxo	2436-2457
/code/branches/pickup/data/overlays/HUDTemplates3.oxo	8145-8555
/code/branches/pickup2/data/overlays/HUDTemplates3.oxo	5942-6405
/code/branches/pickup3/data/overlays/HUDTemplates3.oxo	6418-6523
/code/branches/pickup4/data/overlays/HUDTemplates3.oxo	6594-6710
/code/branches/pickups/data/overlays/HUDTemplates3.oxo	1926-2086,2127,2827-2915
/code/branches/pickups2/data/overlays/HUDTemplates3.oxo	2107-2497,2915-3071
/code/branches/png2/data/overlays/HUDTemplates3.oxo	7262-7263
/code/branches/portals/data/overlays/HUDTemplates3.oxo	8087-8455
/code/branches/portals2/data/overlays/HUDTemplates3.oxo	8460-8602
/code/branches/ppspickups1/data/overlays/HUDTemplates3.oxo	6552-6708
/code/branches/ppspickups2/data/overlays/HUDTemplates3.oxo	6527-6532,6554-6709
/code/branches/ppspickups3/data/overlays/HUDTemplates3.oxo	6757-6997
/code/branches/ppspickups4/data/overlays/HUDTemplates3.oxo	7003-7089
/code/branches/presentation2/data/overlays/HUDTemplates3.oxo	6106-6416,7787-7800
/code/branches/presentation3/data/overlays/HUDTemplates3.oxo	6913-7162
/code/branches/questsystem/data/overlays/HUDTemplates3.oxo	1894-2088
/code/branches/questsystem2/data/overlays/HUDTemplates3.oxo	2107-2259
/code/branches/questsystem5/data/overlays/HUDTemplates3.oxo	2776-2905
/code/branches/releasetodo/data/overlays/HUDTemplates3.oxo	7614-7647
/code/branches/resource/data/overlays/HUDTemplates3.oxo	3327-3366
/code/branches/resource2/data/overlays/HUDTemplates3.oxo	3372-5694
/code/branches/rocket/data/overlays/HUDTemplates3.oxo	6523-6950
/code/branches/rocket2/data/overlays/HUDTemplates3.oxo	6953-6970
/code/branches/script_trigger/data/overlays/HUDTemplates3.oxo	1295-1953,1955
/code/branches/skybox2/data/overlays/HUDTemplates3.oxo	6559-6989
/code/branches/sound/data/overlays/HUDTemplates3.oxo	2829-3010
/code/branches/sound3/data/overlays/HUDTemplates3.oxo	5941-6102
/code/branches/spaceboundaries/data/overlays/HUDTemplates3.oxo	8085-8457
/code/branches/spaceboundaries2/data/overlays/HUDTemplates3.oxo	8460-8613
/code/branches/spacerace/data/overlays/HUDTemplates3.oxo	8182-8630
/code/branches/steering/data/overlays/HUDTemplates3.oxo	5949-6091,8140-8595
/code/branches/tetris/data/overlays/HUDTemplates3.oxo	8100-8563
/code/branches/tutoriallevel/data/overlays/HUDTemplates3.oxo	7827-8370
/code/branches/tutoriallevel2/data/overlays/HUDTemplates3.oxo	8370-8452
/code/branches/tutoriallevel3/data/overlays/HUDTemplates3.oxo	8453-8636
/code/branches/unity_build/data/overlays/HUDTemplates3.oxo	8440-8716
/code/branches/weapon/data/overlays/HUDTemplates3.oxo	1925-2094
/code/branches/weapon2/data/overlays/HUDTemplates3.oxo	2107-2488
/code/branches/weapons/data/overlays/HUDTemplates3.oxo	2897-3051,8143-8591
/code/branches/weaponsystem/data/overlays/HUDTemplates3.oxo	2742-2890

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

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/environment3/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/formation/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/gamecontent/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/hud/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/masterserverfix/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/menue/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/newlevel2012/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/output/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/pickup2012/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/presentation/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/presentation2011/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/shipSelection/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/sound2012/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/spacegate/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/spaceraceTwo/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/surfaceRace/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/usability/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/trunk/data/overlays/HUDTemplatesFPS.oxo	merged	eligible
/code/branches/ai/data/overlays/HUDTemplatesFPS.oxo	6592-7033
/code/branches/ai2/data/overlays/HUDTemplatesFPS.oxo	8721-8880
/code/branches/bigships/data/overlays/HUDTemplatesFPS.oxo	8137-8588
/code/branches/buildsystem/data/overlays/HUDTemplatesFPS.oxo	1874-2276,2278-2400
/code/branches/buildsystem2/data/overlays/HUDTemplatesFPS.oxo	2506-2658
/code/branches/buildsystem3/data/overlays/HUDTemplatesFPS.oxo	2662-2708
/code/branches/ceguilua/data/overlays/HUDTemplatesFPS.oxo	1802-1808
/code/branches/chat/data/overlays/HUDTemplatesFPS.oxo	6527-6797
/code/branches/chat2/data/overlays/HUDTemplatesFPS.oxo	6836-6910
/code/branches/console/data/overlays/HUDTemplatesFPS.oxo	5941-6104
/code/branches/consolecommands2/data/overlays/HUDTemplatesFPS.oxo	6451-7178
/code/branches/consolecommands3/data/overlays/HUDTemplatesFPS.oxo	7178-7283
/code/branches/core3/data/overlays/HUDTemplatesFPS.oxo	1572-1739
/code/branches/core4/data/overlays/HUDTemplatesFPS.oxo	3221-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.oxo	5768-5928,6009
/code/branches/data_cleanup/data/overlays/HUDTemplatesFPS.oxo	7537-7686
/code/branches/doc/data/overlays/HUDTemplatesFPS.oxo	7290-7400
/code/branches/dockingsystem/data/overlays/HUDTemplatesFPS.oxo	8101-8192
/code/branches/dynamicmatch/data/overlays/HUDTemplatesFPS.oxo	6584-7030
/code/branches/fps/data/overlays/HUDTemplatesFPS.oxo	6591-7072
/code/branches/gameimmersion/data/overlays/HUDTemplatesFPS.oxo	8102-8577
/code/branches/gamestate/data/overlays/HUDTemplatesFPS.oxo	6430-6572,6621-6661
/code/branches/gamestates2/data/overlays/HUDTemplatesFPS.oxo	6594-6745
/code/branches/gametypes/data/overlays/HUDTemplatesFPS.oxo	2826-3031
/code/branches/gcc43/data/overlays/HUDTemplatesFPS.oxo	1580
/code/branches/gui/data/overlays/HUDTemplatesFPS.oxo	1635-1723,2795-2894
/code/branches/hudelements/data/overlays/HUDTemplatesFPS.oxo	6584-6941
/code/branches/hudimprovements/data/overlays/HUDTemplatesFPS.oxo	7920-8672
/code/branches/ingamemenu/data/overlays/HUDTemplatesFPS.oxo	6000-6023
/code/branches/input/data/overlays/HUDTemplatesFPS.oxo	1629-1636
/code/branches/ipv6/data/overlays/HUDTemplatesFPS.oxo	7293-7458
/code/branches/kicklib/data/overlays/HUDTemplatesFPS.oxo	7940-8096,8098-8277
/code/branches/kicklib2/data/overlays/HUDTemplatesFPS.oxo	8282-8350
/code/branches/lastmanstanding/data/overlays/HUDTemplatesFPS.oxo	7479-7644
/code/branches/lastmanstanding3/data/overlays/HUDTemplatesFPS.oxo	7903-8175
/code/branches/libraries/data/overlays/HUDTemplatesFPS.oxo	5612-5692
/code/branches/libraries2/data/overlays/HUDTemplatesFPS.oxo	5703-5737
/code/branches/lod/data/overlays/HUDTemplatesFPS.oxo	6586-6911
/code/branches/lodfinal/data/overlays/HUDTemplatesFPS.oxo	2372-2411
/code/branches/mac_osx/data/overlays/HUDTemplatesFPS.oxo	7789-8128,8135
/code/branches/map/data/overlays/HUDTemplatesFPS.oxo	2801-3086,3089
/code/branches/masterserver/data/overlays/HUDTemplatesFPS.oxo	7502-7738
/code/branches/menu/data/overlays/HUDTemplatesFPS.oxo	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/overlays/HUDTemplatesFPS.oxo	2754-2824
/code/branches/netp2/data/overlays/HUDTemplatesFPS.oxo	2835-2988
/code/branches/netp3/data/overlays/HUDTemplatesFPS.oxo	2988-3082
/code/branches/netp6/data/overlays/HUDTemplatesFPS.oxo	3214-3302
/code/branches/network/data/overlays/HUDTemplatesFPS.oxo	2356
/code/branches/network2/data/overlays/HUDTemplatesFPS.oxo	6434-6465
/code/branches/network3/data/overlays/HUDTemplatesFPS.oxo	7196-7344
/code/branches/network4/data/overlays/HUDTemplatesFPS.oxo	7497-7755
/code/branches/network5/data/overlays/HUDTemplatesFPS.oxo	7757-7781
/code/branches/network6/data/overlays/HUDTemplatesFPS.oxo	7823-8315
/code/branches/network64/data/overlays/HUDTemplatesFPS.oxo	2210-2355
/code/branches/notifications/data/overlays/HUDTemplatesFPS.oxo	7314-7401
/code/branches/objecthierarchy/data/overlays/HUDTemplatesFPS.oxo	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/overlays/HUDTemplatesFPS.oxo	2171-2479
/code/branches/ois_update/data/overlays/HUDTemplatesFPS.oxo	7506-7788
/code/branches/overlay/data/overlays/HUDTemplatesFPS.oxo	2117-2385
/code/branches/particles/data/overlays/HUDTemplatesFPS.oxo	2829-3085
/code/branches/particles2/data/overlays/HUDTemplatesFPS.oxo	6050-6106,6109
/code/branches/pch/data/overlays/HUDTemplatesFPS.oxo	3113-3194
/code/branches/physics/data/overlays/HUDTemplatesFPS.oxo	1912-2055,2107-2439
/code/branches/physics_merge/data/overlays/HUDTemplatesFPS.oxo	2436-2457
/code/branches/pickup/data/overlays/HUDTemplatesFPS.oxo	8145-8555
/code/branches/pickup2/data/overlays/HUDTemplatesFPS.oxo	5942-6405
/code/branches/pickup3/data/overlays/HUDTemplatesFPS.oxo	6418-6523
/code/branches/pickup4/data/overlays/HUDTemplatesFPS.oxo	6594-6710
/code/branches/pickups/data/overlays/HUDTemplatesFPS.oxo	1926-2086,2127,2827-2915
/code/branches/pickups2/data/overlays/HUDTemplatesFPS.oxo	2107-2497,2915-3071
/code/branches/png2/data/overlays/HUDTemplatesFPS.oxo	7262-7263
/code/branches/portals/data/overlays/HUDTemplatesFPS.oxo	8087-8455
/code/branches/portals2/data/overlays/HUDTemplatesFPS.oxo	8460-8602
/code/branches/ppspickups1/data/overlays/HUDTemplatesFPS.oxo	6552-6708
/code/branches/ppspickups2/data/overlays/HUDTemplatesFPS.oxo	6527-6532,6554-6709
/code/branches/ppspickups3/data/overlays/HUDTemplatesFPS.oxo	6757-6997
/code/branches/ppspickups4/data/overlays/HUDTemplatesFPS.oxo	7003-7089
/code/branches/presentation2/data/overlays/HUDTemplatesFPS.oxo	6106-6416,7787-7800
/code/branches/presentation3/data/overlays/HUDTemplatesFPS.oxo	6913-7162
/code/branches/questsystem/data/overlays/HUDTemplatesFPS.oxo	1894-2088
/code/branches/questsystem2/data/overlays/HUDTemplatesFPS.oxo	2107-2259
/code/branches/questsystem5/data/overlays/HUDTemplatesFPS.oxo	2776-2905
/code/branches/releasetodo/data/overlays/HUDTemplatesFPS.oxo	7614-7647
/code/branches/resource/data/overlays/HUDTemplatesFPS.oxo	3327-3366
/code/branches/resource2/data/overlays/HUDTemplatesFPS.oxo	3372-5694
/code/branches/rocket/data/overlays/HUDTemplatesFPS.oxo	6523-6950
/code/branches/rocket2/data/overlays/HUDTemplatesFPS.oxo	6953-6970
/code/branches/script_trigger/data/overlays/HUDTemplatesFPS.oxo	1295-1953,1955
/code/branches/skybox2/data/overlays/HUDTemplatesFPS.oxo	6559-6989
/code/branches/sound/data/overlays/HUDTemplatesFPS.oxo	2829-3010
/code/branches/sound3/data/overlays/HUDTemplatesFPS.oxo	5941-6102
/code/branches/spaceboundaries/data/overlays/HUDTemplatesFPS.oxo	8085-8457
/code/branches/spaceboundaries2/data/overlays/HUDTemplatesFPS.oxo	8460-8613
/code/branches/spacerace/data/overlays/HUDTemplatesFPS.oxo	8182-8630
/code/branches/steering/data/overlays/HUDTemplatesFPS.oxo	5949-6091,8140-8595
/code/branches/tetris/data/overlays/HUDTemplatesFPS.oxo	8100-8563
/code/branches/tutoriallevel/data/overlays/HUDTemplatesFPS.oxo	7827-8370
/code/branches/tutoriallevel2/data/overlays/HUDTemplatesFPS.oxo	8370-8452
/code/branches/tutoriallevel3/data/overlays/HUDTemplatesFPS.oxo	8453-8636
/code/branches/unity_build/data/overlays/HUDTemplatesFPS.oxo	8440-8716
/code/branches/weapon/data/overlays/HUDTemplatesFPS.oxo	1925-2094
/code/branches/weapon2/data/overlays/HUDTemplatesFPS.oxo	2107-2488
/code/branches/weapons/data/overlays/HUDTemplatesFPS.oxo	2897-3051,8143-8591
/code/branches/weaponsystem/data/overlays/HUDTemplatesFPS.oxo	2742-2890

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

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/overlays/debug.oxo	merged	eligible
/code/branches/environment3/data/overlays/debug.oxo	merged	eligible
/code/branches/formation/data/overlays/debug.oxo	merged	eligible
/code/branches/gamecontent/data/overlays/debug.oxo	merged	eligible
/code/branches/hud/data/overlays/debug.oxo	merged	eligible
/code/branches/masterserverfix/data/overlays/debug.oxo	merged	eligible
/code/branches/menue/data/overlays/debug.oxo	merged	eligible
/code/branches/newlevel2012/data/overlays/debug.oxo	merged	eligible
/code/branches/output/data/overlays/debug.oxo	merged	eligible
/code/branches/pickup2012/data/overlays/debug.oxo	merged	eligible
/code/branches/presentation/data/overlays/debug.oxo	merged	eligible
/code/branches/presentation2011/data/overlays/debug.oxo	merged	eligible
/code/branches/shipSelection/data/overlays/debug.oxo	merged	eligible
/code/branches/sound2012/data/overlays/debug.oxo	merged	eligible
/code/branches/spacegate/data/overlays/debug.oxo	merged	eligible
/code/branches/spaceraceTwo/data/overlays/debug.oxo	merged	eligible
/code/branches/surfaceRace/data/overlays/debug.oxo	merged	eligible
/code/branches/usability/data/overlays/debug.oxo	merged	eligible
/code/trunk/data/overlays/debug.oxo	merged	eligible
/code/branches/ai/data/overlays/debug.oxo	6592-7033
/code/branches/ai2/data/overlays/debug.oxo	8721-8880
/code/branches/bigships/data/overlays/debug.oxo	8137-8588
/code/branches/buildsystem/data/overlays/debug.oxo	1874-2276,2278-2400
/code/branches/buildsystem2/data/overlays/debug.oxo	2506-2658
/code/branches/buildsystem3/data/overlays/debug.oxo	2662-2708
/code/branches/ceguilua/data/overlays/debug.oxo	1802-1808
/code/branches/chat/data/overlays/debug.oxo	6527-6797
/code/branches/chat2/data/overlays/debug.oxo	6836-6910
/code/branches/console/data/overlays/debug.oxo	5941-6104
/code/branches/consolecommands2/data/overlays/debug.oxo	6451-7178
/code/branches/consolecommands3/data/overlays/debug.oxo	7178-7283
/code/branches/core3/data/overlays/debug.oxo	1572-1739
/code/branches/core4/data/overlays/debug.oxo	3221-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.oxo	5768-5928,6009
/code/branches/data_cleanup/data/overlays/debug.oxo	7537-7686
/code/branches/doc/data/overlays/debug.oxo	7290-7400
/code/branches/dockingsystem/data/overlays/debug.oxo	8101-8192
/code/branches/dynamicmatch/data/overlays/debug.oxo	6584-7030
/code/branches/fps/data/overlays/debug.oxo	6591-7072
/code/branches/gameimmersion/data/overlays/debug.oxo	8102-8577
/code/branches/gamestate/data/overlays/debug.oxo	6430-6572,6621-6661
/code/branches/gamestates2/data/overlays/debug.oxo	6594-6745
/code/branches/gametypes/data/overlays/debug.oxo	2826-3031
/code/branches/gcc43/data/overlays/debug.oxo	1580
/code/branches/gui/data/overlays/debug.oxo	1635-1723,2795-2894
/code/branches/hudelements/data/overlays/debug.oxo	6584-6941
/code/branches/hudimprovements/data/overlays/debug.oxo	7920-8672
/code/branches/ingamemenu/data/overlays/debug.oxo	6000-6023
/code/branches/input/data/overlays/debug.oxo	1629-1636
/code/branches/ipv6/data/overlays/debug.oxo	7293-7458
/code/branches/kicklib/data/overlays/debug.oxo	7940-8096,8098-8277
/code/branches/kicklib2/data/overlays/debug.oxo	8282-8350
/code/branches/lastmanstanding/data/overlays/debug.oxo	7479-7644
/code/branches/lastmanstanding3/data/overlays/debug.oxo	7903-8175
/code/branches/libraries/data/overlays/debug.oxo	5612-5692
/code/branches/libraries2/data/overlays/debug.oxo	5703-5737
/code/branches/lod/data/overlays/debug.oxo	6586-6911
/code/branches/lodfinal/data/overlays/debug.oxo	2372-2411
/code/branches/mac_osx/data/overlays/debug.oxo	7789-8128,8135
/code/branches/map/data/overlays/debug.oxo	2801-3086,3089
/code/branches/masterserver/data/overlays/debug.oxo	7502-7738
/code/branches/menu/data/overlays/debug.oxo	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/overlays/debug.oxo	2754-2824
/code/branches/netp2/data/overlays/debug.oxo	2835-2988
/code/branches/netp3/data/overlays/debug.oxo	2988-3082
/code/branches/netp6/data/overlays/debug.oxo	3214-3302
/code/branches/network/data/overlays/debug.oxo	2356
/code/branches/network2/data/overlays/debug.oxo	6434-6465
/code/branches/network3/data/overlays/debug.oxo	7196-7344
/code/branches/network4/data/overlays/debug.oxo	7497-7755
/code/branches/network5/data/overlays/debug.oxo	7757-7781
/code/branches/network6/data/overlays/debug.oxo	7823-8315
/code/branches/network64/data/overlays/debug.oxo	2210-2355
/code/branches/notifications/data/overlays/debug.oxo	7314-7401
/code/branches/objecthierarchy/data/overlays/debug.oxo	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/overlays/debug.oxo	2171-2479
/code/branches/ois_update/data/overlays/debug.oxo	7506-7788
/code/branches/overlay/data/overlays/debug.oxo	2117-2385
/code/branches/particles/data/overlays/debug.oxo	2829-3085
/code/branches/particles2/data/overlays/debug.oxo	6050-6106,6109
/code/branches/pch/data/overlays/debug.oxo	3113-3194
/code/branches/physics/data/overlays/debug.oxo	1912-2055,2107-2439
/code/branches/physics_merge/data/overlays/debug.oxo	2436-2457
/code/branches/pickup/data/overlays/debug.oxo	8145-8555
/code/branches/pickup2/data/overlays/debug.oxo	5942-6405
/code/branches/pickup3/data/overlays/debug.oxo	6418-6523
/code/branches/pickup4/data/overlays/debug.oxo	6594-6710
/code/branches/pickups/data/overlays/debug.oxo	1926-2086,2127,2827-2915
/code/branches/pickups2/data/overlays/debug.oxo	2107-2497,2915-3071
/code/branches/png2/data/overlays/debug.oxo	7262-7263
/code/branches/portals/data/overlays/debug.oxo	8087-8455
/code/branches/portals2/data/overlays/debug.oxo	8460-8602
/code/branches/ppspickups1/data/overlays/debug.oxo	6552-6708
/code/branches/ppspickups2/data/overlays/debug.oxo	6527-6532,6554-6709
/code/branches/ppspickups3/data/overlays/debug.oxo	6757-6997
/code/branches/ppspickups4/data/overlays/debug.oxo	7003-7089
/code/branches/presentation2/data/overlays/debug.oxo	6106-6416,7787-7800
/code/branches/presentation3/data/overlays/debug.oxo	6913-7162
/code/branches/questsystem/data/overlays/debug.oxo	1894-2088
/code/branches/questsystem2/data/overlays/debug.oxo	2107-2259
/code/branches/questsystem5/data/overlays/debug.oxo	2776-2905
/code/branches/releasetodo/data/overlays/debug.oxo	7614-7647
/code/branches/resource/data/overlays/debug.oxo	3327-3366
/code/branches/resource2/data/overlays/debug.oxo	3372-5694
/code/branches/rocket/data/overlays/debug.oxo	6523-6950
/code/branches/rocket2/data/overlays/debug.oxo	6953-6970
/code/branches/script_trigger/data/overlays/debug.oxo	1295-1953,1955
/code/branches/skybox2/data/overlays/debug.oxo	6559-6989
/code/branches/sound/data/overlays/debug.oxo	2829-3010
/code/branches/sound3/data/overlays/debug.oxo	5941-6102
/code/branches/spaceboundaries/data/overlays/debug.oxo	8085-8457
/code/branches/spaceboundaries2/data/overlays/debug.oxo	8460-8613
/code/branches/spacerace/data/overlays/debug.oxo	8182-8630
/code/branches/steering/data/overlays/debug.oxo	5949-6091,8140-8595
/code/branches/tetris/data/overlays/debug.oxo	8100-8563
/code/branches/tutoriallevel/data/overlays/debug.oxo	7827-8370
/code/branches/tutoriallevel2/data/overlays/debug.oxo	8370-8452
/code/branches/tutoriallevel3/data/overlays/debug.oxo	8453-8636
/code/branches/unity_build/data/overlays/debug.oxo	8440-8716
/code/branches/weapon/data/overlays/debug.oxo	1925-2094
/code/branches/weapon2/data/overlays/debug.oxo	2107-2488
/code/branches/weapons/data/overlays/debug.oxo	2897-3051,8143-8591
/code/branches/weaponsystem/data/overlays/debug.oxo	2742-2890

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

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/environment3/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/formation/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/gamecontent/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/hud/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/masterserverfix/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/menue/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/newlevel2012/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/output/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/pickup2012/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/presentation/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/presentation2011/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/shipSelection/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/sound2012/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/spacegate/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/spaceraceTwo/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/surfaceRace/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/usability/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/trunk/data/overlays/dynamicMatchHUD.oxo	merged	eligible
/code/branches/ai/data/overlays/dynamicMatchHUD.oxo	6592-7033
/code/branches/ai2/data/overlays/dynamicMatchHUD.oxo	8721-8880
/code/branches/bigships/data/overlays/dynamicMatchHUD.oxo	8137-8588
/code/branches/buildsystem/data/overlays/dynamicMatchHUD.oxo	1874-2276,2278-2400
/code/branches/buildsystem2/data/overlays/dynamicMatchHUD.oxo	2506-2658
/code/branches/buildsystem3/data/overlays/dynamicMatchHUD.oxo	2662-2708
/code/branches/ceguilua/data/overlays/dynamicMatchHUD.oxo	1802-1808
/code/branches/chat/data/overlays/dynamicMatchHUD.oxo	6527-6797
/code/branches/chat2/data/overlays/dynamicMatchHUD.oxo	6836-6910
/code/branches/console/data/overlays/dynamicMatchHUD.oxo	5941-6104
/code/branches/consolecommands2/data/overlays/dynamicMatchHUD.oxo	6451-7178
/code/branches/consolecommands3/data/overlays/dynamicMatchHUD.oxo	7178-7283
/code/branches/core3/data/overlays/dynamicMatchHUD.oxo	1572-1739
/code/branches/core4/data/overlays/dynamicMatchHUD.oxo	3221-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.oxo	5768-5928,6009
/code/branches/data_cleanup/data/overlays/dynamicMatchHUD.oxo	7537-7686
/code/branches/doc/data/overlays/dynamicMatchHUD.oxo	7290-7400
/code/branches/dockingsystem/data/overlays/dynamicMatchHUD.oxo	8101-8192
/code/branches/dynamicmatch/data/overlays/dynamicMatchHUD.oxo	6584-7030
/code/branches/fps/data/overlays/dynamicMatchHUD.oxo	6591-7072
/code/branches/gameimmersion/data/overlays/dynamicMatchHUD.oxo	8102-8577
/code/branches/gamestate/data/overlays/dynamicMatchHUD.oxo	6430-6572,6621-6661
/code/branches/gamestates2/data/overlays/dynamicMatchHUD.oxo	6594-6745
/code/branches/gametypes/data/overlays/dynamicMatchHUD.oxo	2826-3031
/code/branches/gcc43/data/overlays/dynamicMatchHUD.oxo	1580
/code/branches/gui/data/overlays/dynamicMatchHUD.oxo	1635-1723,2795-2894
/code/branches/hudelements/data/overlays/dynamicMatchHUD.oxo	6584-6941
/code/branches/hudimprovements/data/overlays/dynamicMatchHUD.oxo	7920-8672
/code/branches/ingamemenu/data/overlays/dynamicMatchHUD.oxo	6000-6023
/code/branches/input/data/overlays/dynamicMatchHUD.oxo	1629-1636
/code/branches/ipv6/data/overlays/dynamicMatchHUD.oxo	7293-7458
/code/branches/kicklib/data/overlays/dynamicMatchHUD.oxo	7940-8096,8098-8277
/code/branches/kicklib2/data/overlays/dynamicMatchHUD.oxo	8282-8350
/code/branches/lastmanstanding/data/overlays/dynamicMatchHUD.oxo	7479-7644
/code/branches/lastmanstanding3/data/overlays/dynamicMatchHUD.oxo	7903-8175
/code/branches/libraries/data/overlays/dynamicMatchHUD.oxo	5612-5692
/code/branches/libraries2/data/overlays/dynamicMatchHUD.oxo	5703-5737
/code/branches/lod/data/overlays/dynamicMatchHUD.oxo	6586-6911
/code/branches/lodfinal/data/overlays/dynamicMatchHUD.oxo	2372-2411
/code/branches/mac_osx/data/overlays/dynamicMatchHUD.oxo	7789-8128,8135
/code/branches/map/data/overlays/dynamicMatchHUD.oxo	2801-3086,3089
/code/branches/masterserver/data/overlays/dynamicMatchHUD.oxo	7502-7738
/code/branches/menu/data/overlays/dynamicMatchHUD.oxo	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/overlays/dynamicMatchHUD.oxo	2754-2824
/code/branches/netp2/data/overlays/dynamicMatchHUD.oxo	2835-2988
/code/branches/netp3/data/overlays/dynamicMatchHUD.oxo	2988-3082
/code/branches/netp6/data/overlays/dynamicMatchHUD.oxo	3214-3302
/code/branches/network/data/overlays/dynamicMatchHUD.oxo	2356
/code/branches/network2/data/overlays/dynamicMatchHUD.oxo	6434-6465
/code/branches/network3/data/overlays/dynamicMatchHUD.oxo	7196-7344
/code/branches/network4/data/overlays/dynamicMatchHUD.oxo	7497-7755
/code/branches/network5/data/overlays/dynamicMatchHUD.oxo	7757-7781
/code/branches/network6/data/overlays/dynamicMatchHUD.oxo	7823-8315
/code/branches/network64/data/overlays/dynamicMatchHUD.oxo	2210-2355
/code/branches/notifications/data/overlays/dynamicMatchHUD.oxo	7314-7401
/code/branches/objecthierarchy/data/overlays/dynamicMatchHUD.oxo	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/overlays/dynamicMatchHUD.oxo	2171-2479
/code/branches/ois_update/data/overlays/dynamicMatchHUD.oxo	7506-7788
/code/branches/overlay/data/overlays/dynamicMatchHUD.oxo	2117-2385
/code/branches/particles/data/overlays/dynamicMatchHUD.oxo	2829-3085
/code/branches/particles2/data/overlays/dynamicMatchHUD.oxo	6050-6106,6109
/code/branches/pch/data/overlays/dynamicMatchHUD.oxo	3113-3194
/code/branches/physics/data/overlays/dynamicMatchHUD.oxo	1912-2055,2107-2439
/code/branches/physics_merge/data/overlays/dynamicMatchHUD.oxo	2436-2457
/code/branches/pickup/data/overlays/dynamicMatchHUD.oxo	8145-8555
/code/branches/pickup2/data/overlays/dynamicMatchHUD.oxo	5942-6405
/code/branches/pickup3/data/overlays/dynamicMatchHUD.oxo	6418-6523
/code/branches/pickup4/data/overlays/dynamicMatchHUD.oxo	6594-6710
/code/branches/pickups/data/overlays/dynamicMatchHUD.oxo	1926-2086,2127,2827-2915
/code/branches/pickups2/data/overlays/dynamicMatchHUD.oxo	2107-2497,2915-3071
/code/branches/png2/data/overlays/dynamicMatchHUD.oxo	7262-7263
/code/branches/portals/data/overlays/dynamicMatchHUD.oxo	8087-8455
/code/branches/portals2/data/overlays/dynamicMatchHUD.oxo	8460-8602
/code/branches/ppspickups1/data/overlays/dynamicMatchHUD.oxo	6552-6708
/code/branches/ppspickups2/data/overlays/dynamicMatchHUD.oxo	6527-6532,6554-6709
/code/branches/ppspickups3/data/overlays/dynamicMatchHUD.oxo	6757-6997
/code/branches/ppspickups4/data/overlays/dynamicMatchHUD.oxo	7003-7089
/code/branches/presentation2/data/overlays/dynamicMatchHUD.oxo	6106-6416,7787-7800
/code/branches/presentation3/data/overlays/dynamicMatchHUD.oxo	6913-7162
/code/branches/questsystem/data/overlays/dynamicMatchHUD.oxo	1894-2088
/code/branches/questsystem2/data/overlays/dynamicMatchHUD.oxo	2107-2259
/code/branches/questsystem5/data/overlays/dynamicMatchHUD.oxo	2776-2905
/code/branches/releasetodo/data/overlays/dynamicMatchHUD.oxo	7614-7647
/code/branches/resource/data/overlays/dynamicMatchHUD.oxo	3327-3366
/code/branches/resource2/data/overlays/dynamicMatchHUD.oxo	3372-5694
/code/branches/rocket/data/overlays/dynamicMatchHUD.oxo	6523-6950
/code/branches/rocket2/data/overlays/dynamicMatchHUD.oxo	6953-6970
/code/branches/script_trigger/data/overlays/dynamicMatchHUD.oxo	1295-1953,1955
/code/branches/skybox2/data/overlays/dynamicMatchHUD.oxo	6559-6989
/code/branches/sound/data/overlays/dynamicMatchHUD.oxo	2829-3010
/code/branches/sound3/data/overlays/dynamicMatchHUD.oxo	5941-6102
/code/branches/spaceboundaries/data/overlays/dynamicMatchHUD.oxo	8085-8457
/code/branches/spaceboundaries2/data/overlays/dynamicMatchHUD.oxo	8460-8613
/code/branches/spacerace/data/overlays/dynamicMatchHUD.oxo	8182-8630
/code/branches/steering/data/overlays/dynamicMatchHUD.oxo	5949-6091,8140-8595
/code/branches/tetris/data/overlays/dynamicMatchHUD.oxo	8100-8563
/code/branches/tutoriallevel/data/overlays/dynamicMatchHUD.oxo	7827-8370
/code/branches/tutoriallevel2/data/overlays/dynamicMatchHUD.oxo	8370-8452
/code/branches/tutoriallevel3/data/overlays/dynamicMatchHUD.oxo	8453-8636
/code/branches/unity_build/data/overlays/dynamicMatchHUD.oxo	8440-8716
/code/branches/weapon/data/overlays/dynamicMatchHUD.oxo	1925-2094
/code/branches/weapon2/data/overlays/dynamicMatchHUD.oxo	2107-2488
/code/branches/weapons/data/overlays/dynamicMatchHUD.oxo	2897-3051,8143-8591
/code/branches/weaponsystem/data/overlays/dynamicMatchHUD.oxo	2742-2890

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

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/environment3/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/formation/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/gamecontent/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/hud/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/masterserverfix/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/menue/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/newlevel2012/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/output/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/pickup2012/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/presentation/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/presentation2011/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/shipSelection/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/sound2012/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/spacegate/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/spaceraceTwo/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/surfaceRace/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/usability/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/trunk/data/overlays/lastManStandingHUD.oxo	merged	eligible
/code/branches/ai/data/overlays/lastManStandingHUD.oxo	6592-7033
/code/branches/ai2/data/overlays/lastManStandingHUD.oxo	8721-8880
/code/branches/bigships/data/overlays/lastManStandingHUD.oxo	8137-8588
/code/branches/buildsystem/data/overlays/lastManStandingHUD.oxo	1874-2276,2278-2400
/code/branches/buildsystem2/data/overlays/lastManStandingHUD.oxo	2506-2658
/code/branches/buildsystem3/data/overlays/lastManStandingHUD.oxo	2662-2708
/code/branches/ceguilua/data/overlays/lastManStandingHUD.oxo	1802-1808
/code/branches/chat/data/overlays/lastManStandingHUD.oxo	6527-6797
/code/branches/chat2/data/overlays/lastManStandingHUD.oxo	6836-6910
/code/branches/console/data/overlays/lastManStandingHUD.oxo	5941-6104
/code/branches/consolecommands2/data/overlays/lastManStandingHUD.oxo	6451-7178
/code/branches/consolecommands3/data/overlays/lastManStandingHUD.oxo	7178-7283
/code/branches/core3/data/overlays/lastManStandingHUD.oxo	1572-1739
/code/branches/core4/data/overlays/lastManStandingHUD.oxo	3221-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.oxo	5768-5928,6009
/code/branches/data_cleanup/data/overlays/lastManStandingHUD.oxo	7537-7686
/code/branches/doc/data/overlays/lastManStandingHUD.oxo	7290-7400
/code/branches/dockingsystem/data/overlays/lastManStandingHUD.oxo	8101-8192
/code/branches/dynamicmatch/data/overlays/lastManStandingHUD.oxo	6584-7030
/code/branches/fps/data/overlays/lastManStandingHUD.oxo	6591-7072
/code/branches/gameimmersion/data/overlays/lastManStandingHUD.oxo	8102-8577
/code/branches/gamestate/data/overlays/lastManStandingHUD.oxo	6430-6572,6621-6661
/code/branches/gamestates2/data/overlays/lastManStandingHUD.oxo	6594-6745
/code/branches/gametypes/data/overlays/lastManStandingHUD.oxo	2826-3031
/code/branches/gcc43/data/overlays/lastManStandingHUD.oxo	1580
/code/branches/gui/data/overlays/lastManStandingHUD.oxo	1635-1723,2795-2894
/code/branches/hudelements/data/overlays/lastManStandingHUD.oxo	6584-6941
/code/branches/hudimprovements/data/overlays/lastManStandingHUD.oxo	7920-8672
/code/branches/ingamemenu/data/overlays/lastManStandingHUD.oxo	6000-6023
/code/branches/input/data/overlays/lastManStandingHUD.oxo	1629-1636
/code/branches/ipv6/data/overlays/lastManStandingHUD.oxo	7293-7458
/code/branches/kicklib/data/overlays/lastManStandingHUD.oxo	7940-8096,8098-8277
/code/branches/kicklib2/data/overlays/lastManStandingHUD.oxo	8282-8350
/code/branches/lastmanstanding/data/overlays/lastManStandingHUD.oxo	7479-7644
/code/branches/lastmanstanding3/data/overlays/lastManStandingHUD.oxo	7903-8175
/code/branches/libraries/data/overlays/lastManStandingHUD.oxo	5612-5692
/code/branches/libraries2/data/overlays/lastManStandingHUD.oxo	5703-5737
/code/branches/lod/data/overlays/lastManStandingHUD.oxo	6586-6911
/code/branches/lodfinal/data/overlays/lastManStandingHUD.oxo	2372-2411
/code/branches/mac_osx/data/overlays/lastManStandingHUD.oxo	7789-8128,8135
/code/branches/map/data/overlays/lastManStandingHUD.oxo	2801-3086,3089
/code/branches/masterserver/data/overlays/lastManStandingHUD.oxo	7502-7738
/code/branches/menu/data/overlays/lastManStandingHUD.oxo	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/overlays/lastManStandingHUD.oxo	2754-2824
/code/branches/netp2/data/overlays/lastManStandingHUD.oxo	2835-2988
/code/branches/netp3/data/overlays/lastManStandingHUD.oxo	2988-3082
/code/branches/netp6/data/overlays/lastManStandingHUD.oxo	3214-3302
/code/branches/network/data/overlays/lastManStandingHUD.oxo	2356
/code/branches/network2/data/overlays/lastManStandingHUD.oxo	6434-6465
/code/branches/network3/data/overlays/lastManStandingHUD.oxo	7196-7344
/code/branches/network4/data/overlays/lastManStandingHUD.oxo	7497-7755
/code/branches/network5/data/overlays/lastManStandingHUD.oxo	7757-7781
/code/branches/network6/data/overlays/lastManStandingHUD.oxo	7823-8315
/code/branches/network64/data/overlays/lastManStandingHUD.oxo	2210-2355
/code/branches/notifications/data/overlays/lastManStandingHUD.oxo	7314-7401
/code/branches/objecthierarchy/data/overlays/lastManStandingHUD.oxo	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/overlays/lastManStandingHUD.oxo	2171-2479
/code/branches/ois_update/data/overlays/lastManStandingHUD.oxo	7506-7788
/code/branches/overlay/data/overlays/lastManStandingHUD.oxo	2117-2385
/code/branches/particles/data/overlays/lastManStandingHUD.oxo	2829-3085
/code/branches/particles2/data/overlays/lastManStandingHUD.oxo	6050-6106,6109
/code/branches/pch/data/overlays/lastManStandingHUD.oxo	3113-3194
/code/branches/physics/data/overlays/lastManStandingHUD.oxo	1912-2055,2107-2439
/code/branches/physics_merge/data/overlays/lastManStandingHUD.oxo	2436-2457
/code/branches/pickup/data/overlays/lastManStandingHUD.oxo	8145-8555
/code/branches/pickup2/data/overlays/lastManStandingHUD.oxo	5942-6405
/code/branches/pickup3/data/overlays/lastManStandingHUD.oxo	6418-6523
/code/branches/pickup4/data/overlays/lastManStandingHUD.oxo	6594-6710
/code/branches/pickups/data/overlays/lastManStandingHUD.oxo	1926-2086,2127,2827-2915
/code/branches/pickups2/data/overlays/lastManStandingHUD.oxo	2107-2497,2915-3071
/code/branches/png2/data/overlays/lastManStandingHUD.oxo	7262-7263
/code/branches/portals/data/overlays/lastManStandingHUD.oxo	8087-8455
/code/branches/portals2/data/overlays/lastManStandingHUD.oxo	8460-8602
/code/branches/ppspickups1/data/overlays/lastManStandingHUD.oxo	6552-6708
/code/branches/ppspickups2/data/overlays/lastManStandingHUD.oxo	6527-6532,6554-6709
/code/branches/ppspickups3/data/overlays/lastManStandingHUD.oxo	6757-6997
/code/branches/ppspickups4/data/overlays/lastManStandingHUD.oxo	7003-7089
/code/branches/presentation2/data/overlays/lastManStandingHUD.oxo	6106-6416,7787-7800
/code/branches/presentation3/data/overlays/lastManStandingHUD.oxo	6913-7162
/code/branches/questsystem/data/overlays/lastManStandingHUD.oxo	1894-2088
/code/branches/questsystem2/data/overlays/lastManStandingHUD.oxo	2107-2259
/code/branches/questsystem5/data/overlays/lastManStandingHUD.oxo	2776-2905
/code/branches/releasetodo/data/overlays/lastManStandingHUD.oxo	7614-7647
/code/branches/resource/data/overlays/lastManStandingHUD.oxo	3327-3366
/code/branches/resource2/data/overlays/lastManStandingHUD.oxo	3372-5694
/code/branches/rocket/data/overlays/lastManStandingHUD.oxo	6523-6950
/code/branches/rocket2/data/overlays/lastManStandingHUD.oxo	6953-6970
/code/branches/script_trigger/data/overlays/lastManStandingHUD.oxo	1295-1953,1955
/code/branches/skybox2/data/overlays/lastManStandingHUD.oxo	6559-6989
/code/branches/sound/data/overlays/lastManStandingHUD.oxo	2829-3010
/code/branches/sound3/data/overlays/lastManStandingHUD.oxo	5941-6102
/code/branches/spaceboundaries/data/overlays/lastManStandingHUD.oxo	8085-8457
/code/branches/spaceboundaries2/data/overlays/lastManStandingHUD.oxo	8460-8613
/code/branches/spacerace/data/overlays/lastManStandingHUD.oxo	8182-8630
/code/branches/steering/data/overlays/lastManStandingHUD.oxo	5949-6091,8140-8595
/code/branches/tetris/data/overlays/lastManStandingHUD.oxo	8100-8563
/code/branches/tutoriallevel/data/overlays/lastManStandingHUD.oxo	7827-8370
/code/branches/tutoriallevel2/data/overlays/lastManStandingHUD.oxo	8370-8452
/code/branches/tutoriallevel3/data/overlays/lastManStandingHUD.oxo	8453-8636
/code/branches/unity_build/data/overlays/lastManStandingHUD.oxo	8440-8716
/code/branches/weapon/data/overlays/lastManStandingHUD.oxo	1925-2094
/code/branches/weapon2/data/overlays/lastManStandingHUD.oxo	2107-2488
/code/branches/weapons/data/overlays/lastManStandingHUD.oxo	2897-3051,8143-8591
/code/branches/weaponsystem/data/overlays/lastManStandingHUD.oxo	2742-2890

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

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/environment3/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/formation/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/gamecontent/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/hud/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/masterserverfix/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/menue/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/newlevel2012/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/output/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/pickup2012/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/presentation/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/presentation2011/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/shipSelection/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/sound2012/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/spacegate/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/spaceraceTwo/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/surfaceRace/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/trunk/data/overlays/lastTeamStandingHUD.oxo	merged	eligible
/code/branches/ai/data/overlays/lastTeamStandingHUD.oxo	6592-7033
/code/branches/ai2/data/overlays/lastTeamStandingHUD.oxo	8721-8880
/code/branches/bigships/data/overlays/lastTeamStandingHUD.oxo	8137-8588
/code/branches/buildsystem/data/overlays/lastTeamStandingHUD.oxo	1874-2276,2278-2400
/code/branches/buildsystem2/data/overlays/lastTeamStandingHUD.oxo	2506-2658
/code/branches/buildsystem3/data/overlays/lastTeamStandingHUD.oxo	2662-2708
/code/branches/ceguilua/data/overlays/lastTeamStandingHUD.oxo	1802-1808
/code/branches/chat/data/overlays/lastTeamStandingHUD.oxo	6527-6797
/code/branches/chat2/data/overlays/lastTeamStandingHUD.oxo	6836-6910
/code/branches/console/data/overlays/lastTeamStandingHUD.oxo	5941-6104
/code/branches/consolecommands2/data/overlays/lastTeamStandingHUD.oxo	6451-7178
/code/branches/consolecommands3/data/overlays/lastTeamStandingHUD.oxo	7178-7283
/code/branches/core3/data/overlays/lastTeamStandingHUD.oxo	1572-1739
/code/branches/core4/data/overlays/lastTeamStandingHUD.oxo	3221-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.oxo	5768-5928,6009
/code/branches/data_cleanup/data/overlays/lastTeamStandingHUD.oxo	7537-7686
/code/branches/doc/data/overlays/lastTeamStandingHUD.oxo	7290-7400
/code/branches/dockingsystem/data/overlays/lastTeamStandingHUD.oxo	8101-8192
/code/branches/dynamicmatch/data/overlays/lastTeamStandingHUD.oxo	6584-7030
/code/branches/fps/data/overlays/lastTeamStandingHUD.oxo	6591-7072
/code/branches/gameimmersion/data/overlays/lastTeamStandingHUD.oxo	8102-8577
/code/branches/gamestate/data/overlays/lastTeamStandingHUD.oxo	6430-6572,6621-6661
/code/branches/gamestates2/data/overlays/lastTeamStandingHUD.oxo	6594-6745
/code/branches/gametypes/data/overlays/lastTeamStandingHUD.oxo	2826-3031
/code/branches/gcc43/data/overlays/lastTeamStandingHUD.oxo	1580
/code/branches/gui/data/overlays/lastTeamStandingHUD.oxo	1635-1723,2795-2894
/code/branches/hudelements/data/overlays/lastTeamStandingHUD.oxo	6584-6941
/code/branches/hudimprovements/data/overlays/lastTeamStandingHUD.oxo	7920-8672
/code/branches/ingamemenu/data/overlays/lastTeamStandingHUD.oxo	6000-6023
/code/branches/input/data/overlays/lastTeamStandingHUD.oxo	1629-1636
/code/branches/ipv6/data/overlays/lastTeamStandingHUD.oxo	7293-7458
/code/branches/kicklib/data/overlays/lastTeamStandingHUD.oxo	7940-8096,8098-8277
/code/branches/kicklib2/data/overlays/lastTeamStandingHUD.oxo	8282-8350
/code/branches/lastmanstanding/data/overlays/lastTeamStandingHUD.oxo	7479-7644
/code/branches/lastmanstanding3/data/overlays/lastTeamStandingHUD.oxo	7903-8175
/code/branches/libraries/data/overlays/lastTeamStandingHUD.oxo	5612-5692
/code/branches/libraries2/data/overlays/lastTeamStandingHUD.oxo	5703-5737
/code/branches/lod/data/overlays/lastTeamStandingHUD.oxo	6586-6911
/code/branches/lodfinal/data/overlays/lastTeamStandingHUD.oxo	2372-2411
/code/branches/mac_osx/data/overlays/lastTeamStandingHUD.oxo	7789-8128,8135
/code/branches/map/data/overlays/lastTeamStandingHUD.oxo	2801-3086,3089
/code/branches/masterserver/data/overlays/lastTeamStandingHUD.oxo	7502-7738
/code/branches/menu/data/overlays/lastTeamStandingHUD.oxo	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/overlays/lastTeamStandingHUD.oxo	2754-2824
/code/branches/netp2/data/overlays/lastTeamStandingHUD.oxo	2835-2988
/code/branches/netp3/data/overlays/lastTeamStandingHUD.oxo	2988-3082
/code/branches/netp6/data/overlays/lastTeamStandingHUD.oxo	3214-3302
/code/branches/network/data/overlays/lastTeamStandingHUD.oxo	2356
/code/branches/network2/data/overlays/lastTeamStandingHUD.oxo	6434-6465
/code/branches/network3/data/overlays/lastTeamStandingHUD.oxo	7196-7344
/code/branches/network4/data/overlays/lastTeamStandingHUD.oxo	7497-7755
/code/branches/network5/data/overlays/lastTeamStandingHUD.oxo	7757-7781
/code/branches/network6/data/overlays/lastTeamStandingHUD.oxo	7823-8315
/code/branches/network64/data/overlays/lastTeamStandingHUD.oxo	2210-2355
/code/branches/notifications/data/overlays/lastTeamStandingHUD.oxo	7314-7401
/code/branches/objecthierarchy/data/overlays/lastTeamStandingHUD.oxo	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/overlays/lastTeamStandingHUD.oxo	2171-2479
/code/branches/ois_update/data/overlays/lastTeamStandingHUD.oxo	7506-7788
/code/branches/overlay/data/overlays/lastTeamStandingHUD.oxo	2117-2385
/code/branches/particles/data/overlays/lastTeamStandingHUD.oxo	2829-3085
/code/branches/particles2/data/overlays/lastTeamStandingHUD.oxo	6050-6106,6109
/code/branches/pch/data/overlays/lastTeamStandingHUD.oxo	3113-3194
/code/branches/physics/data/overlays/lastTeamStandingHUD.oxo	1912-2055,2107-2439
/code/branches/physics_merge/data/overlays/lastTeamStandingHUD.oxo	2436-2457
/code/branches/pickup/data/overlays/lastTeamStandingHUD.oxo	8145-8555
/code/branches/pickup2/data/overlays/lastTeamStandingHUD.oxo	5942-6405
/code/branches/pickup3/data/overlays/lastTeamStandingHUD.oxo	6418-6523
/code/branches/pickup4/data/overlays/lastTeamStandingHUD.oxo	6594-6710
/code/branches/pickups/data/overlays/lastTeamStandingHUD.oxo	1926-2086,2127,2827-2915
/code/branches/pickups2/data/overlays/lastTeamStandingHUD.oxo	2107-2497,2915-3071
/code/branches/png2/data/overlays/lastTeamStandingHUD.oxo	7262-7263
/code/branches/portals/data/overlays/lastTeamStandingHUD.oxo	8087-8455
/code/branches/portals2/data/overlays/lastTeamStandingHUD.oxo	8460-8602
/code/branches/ppspickups1/data/overlays/lastTeamStandingHUD.oxo	6552-6708
/code/branches/ppspickups2/data/overlays/lastTeamStandingHUD.oxo	6527-6532,6554-6709
/code/branches/ppspickups3/data/overlays/lastTeamStandingHUD.oxo	6757-6997
/code/branches/ppspickups4/data/overlays/lastTeamStandingHUD.oxo	7003-7089
/code/branches/presentation2/data/overlays/lastTeamStandingHUD.oxo	6106-6416,7787-7800
/code/branches/presentation3/data/overlays/lastTeamStandingHUD.oxo	6913-7162
/code/branches/questsystem/data/overlays/lastTeamStandingHUD.oxo	1894-2088
/code/branches/questsystem2/data/overlays/lastTeamStandingHUD.oxo	2107-2259
/code/branches/questsystem5/data/overlays/lastTeamStandingHUD.oxo	2776-2905
/code/branches/releasetodo/data/overlays/lastTeamStandingHUD.oxo	7614-7647
/code/branches/resource/data/overlays/lastTeamStandingHUD.oxo	3327-3366
/code/branches/resource2/data/overlays/lastTeamStandingHUD.oxo	3372-5694
/code/branches/rocket/data/overlays/lastTeamStandingHUD.oxo	6523-6950
/code/branches/rocket2/data/overlays/lastTeamStandingHUD.oxo	6953-6970
/code/branches/script_trigger/data/overlays/lastTeamStandingHUD.oxo	1295-1953,1955
/code/branches/skybox2/data/overlays/lastTeamStandingHUD.oxo	6559-6989
/code/branches/sound/data/overlays/lastTeamStandingHUD.oxo	2829-3010
/code/branches/sound3/data/overlays/lastTeamStandingHUD.oxo	5941-6102
/code/branches/spaceboundaries/data/overlays/lastTeamStandingHUD.oxo	8085-8457
/code/branches/spaceboundaries2/data/overlays/lastTeamStandingHUD.oxo	8460-8613
/code/branches/spacerace/data/overlays/lastTeamStandingHUD.oxo	8182-8630
/code/branches/steering/data/overlays/lastTeamStandingHUD.oxo	5949-6091,8140-8595
/code/branches/tetris/data/overlays/lastTeamStandingHUD.oxo	8100-8563
/code/branches/tutoriallevel/data/overlays/lastTeamStandingHUD.oxo	7827-8370
/code/branches/tutoriallevel2/data/overlays/lastTeamStandingHUD.oxo	8370-8452
/code/branches/tutoriallevel3/data/overlays/lastTeamStandingHUD.oxo	8453-8636
/code/branches/unity_build/data/overlays/lastTeamStandingHUD.oxo	8440-8716
/code/branches/usability/data/overlays/lastTeamStandingHUD.oxo	7915-8078
/code/branches/weapon/data/overlays/lastTeamStandingHUD.oxo	1925-2094
/code/branches/weapon2/data/overlays/lastTeamStandingHUD.oxo	2107-2488
/code/branches/weapons/data/overlays/lastTeamStandingHUD.oxo	2897-3051,8143-8591
/code/branches/weaponsystem/data/overlays/lastTeamStandingHUD.oxo	2742-2890

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

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/environment3/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/formation/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/gamecontent/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/hud/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/masterserverfix/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/menue/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/newlevel2012/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/output/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/pickup2012/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/presentation/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/presentation2011/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/shipSelection/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/sound2012/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/spacegate/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/spaceraceTwo/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/surfaceRace/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/usability/data/overlays/pongHUD.oxo	merged	eligible
/code/trunk/data/overlays/pongHUD.oxo	merged	eligible
/code/branches/ai/data/overlays/pongHUD.oxo	6592-7033
/code/branches/ai2/data/overlays/pongHUD.oxo	8721-8880
/code/branches/bigships/data/overlays/pongHUD.oxo	8137-8588
/code/branches/buildsystem/data/overlays/pongHUD.oxo	1874-2276,2278-2400
/code/branches/buildsystem2/data/overlays/pongHUD.oxo	2506-2658
/code/branches/buildsystem3/data/overlays/pongHUD.oxo	2662-2708
/code/branches/ceguilua/data/overlays/pongHUD.oxo	1802-1808
/code/branches/chat/data/overlays/pongHUD.oxo	6527-6797
/code/branches/chat2/data/overlays/pongHUD.oxo	6836-6910
/code/branches/console/data/overlays/pongHUD.oxo	5941-6104
/code/branches/consolecommands2/data/overlays/pongHUD.oxo	6451-7178
/code/branches/consolecommands3/data/overlays/pongHUD.oxo	7178-7283
/code/branches/core3/data/overlays/pongHUD.oxo	1572-1739
/code/branches/core4/data/overlays/pongHUD.oxo	3221-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.oxo	5768-5928,6009
/code/branches/data_cleanup/data/overlays/pongHUD.oxo	7537-7686
/code/branches/doc/data/overlays/pongHUD.oxo	7290-7400
/code/branches/dockingsystem/data/overlays/pongHUD.oxo	8101-8192
/code/branches/dynamicmatch/data/overlays/pongHUD.oxo	6584-7030
/code/branches/fps/data/overlays/pongHUD.oxo	6591-7072
/code/branches/gameimmersion/data/overlays/pongHUD.oxo	8102-8577
/code/branches/gamestate/data/overlays/pongHUD.oxo	6430-6572,6621-6661
/code/branches/gamestates2/data/overlays/pongHUD.oxo	6594-6745
/code/branches/gametypes/data/overlays/pongHUD.oxo	2826-3031
/code/branches/gcc43/data/overlays/pongHUD.oxo	1580
/code/branches/gui/data/overlays/pongHUD.oxo	1635-1723,2795-2894
/code/branches/hudelements/data/overlays/pongHUD.oxo	6584-6941
/code/branches/hudimprovements/data/overlays/pongHUD.oxo	7920-8672
/code/branches/ingamemenu/data/overlays/pongHUD.oxo	6000-6023
/code/branches/input/data/overlays/pongHUD.oxo	1629-1636
/code/branches/ipv6/data/overlays/pongHUD.oxo	7293-7458
/code/branches/kicklib/data/overlays/pongHUD.oxo	7940-8096,8098-8277
/code/branches/kicklib2/data/overlays/pongHUD.oxo	8282-8350
/code/branches/lastmanstanding/data/overlays/pongHUD.oxo	7479-7644
/code/branches/lastmanstanding3/data/overlays/pongHUD.oxo	7903-8175
/code/branches/libraries/data/overlays/pongHUD.oxo	5612-5692
/code/branches/libraries2/data/overlays/pongHUD.oxo	5703-5737
/code/branches/lod/data/overlays/pongHUD.oxo	6586-6911
/code/branches/lodfinal/data/overlays/pongHUD.oxo	2372-2411
/code/branches/mac_osx/data/overlays/pongHUD.oxo	7789-8128,8135
/code/branches/map/data/overlays/pongHUD.oxo	2801-3086,3089
/code/branches/masterserver/data/overlays/pongHUD.oxo	7502-7738
/code/branches/menu/data/overlays/pongHUD.oxo	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/overlays/pongHUD.oxo	2754-2824
/code/branches/netp2/data/overlays/pongHUD.oxo	2835-2988
/code/branches/netp3/data/overlays/pongHUD.oxo	2988-3082
/code/branches/netp6/data/overlays/pongHUD.oxo	3214-3302
/code/branches/network/data/overlays/pongHUD.oxo	2356
/code/branches/network2/data/overlays/pongHUD.oxo	6434-6465
/code/branches/network3/data/overlays/pongHUD.oxo	7196-7344
/code/branches/network4/data/overlays/pongHUD.oxo	7497-7755
/code/branches/network5/data/overlays/pongHUD.oxo	7757-7781
/code/branches/network6/data/overlays/pongHUD.oxo	7823-8315
/code/branches/network64/data/overlays/pongHUD.oxo	2210-2355
/code/branches/notifications/data/overlays/pongHUD.oxo	7314-7401
/code/branches/objecthierarchy/data/overlays/pongHUD.oxo	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/overlays/pongHUD.oxo	2171-2479
/code/branches/ois_update/data/overlays/pongHUD.oxo	7506-7788
/code/branches/overlay/data/overlays/pongHUD.oxo	2117-2385
/code/branches/particles/data/overlays/pongHUD.oxo	2829-3085
/code/branches/particles2/data/overlays/pongHUD.oxo	6050-6106,6109
/code/branches/pch/data/overlays/pongHUD.oxo	3113-3194
/code/branches/physics/data/overlays/pongHUD.oxo	1912-2055,2107-2439
/code/branches/physics_merge/data/overlays/pongHUD.oxo	2436-2457
/code/branches/pickup/data/overlays/pongHUD.oxo	8145-8555
/code/branches/pickup2/data/overlays/pongHUD.oxo	5942-6405
/code/branches/pickup3/data/overlays/pongHUD.oxo	6418-6523
/code/branches/pickup4/data/overlays/pongHUD.oxo	6594-6710
/code/branches/pickups/data/overlays/pongHUD.oxo	1926-2086,2127,2827-2915
/code/branches/pickups2/data/overlays/pongHUD.oxo	2107-2497,2915-3071
/code/branches/png2/data/overlays/pongHUD.oxo	7262-7263
/code/branches/portals/data/overlays/pongHUD.oxo	8087-8455
/code/branches/portals2/data/overlays/pongHUD.oxo	8460-8602
/code/branches/ppspickups1/data/overlays/pongHUD.oxo	6552-6708
/code/branches/ppspickups2/data/overlays/pongHUD.oxo	6527-6532,6554-6709
/code/branches/ppspickups3/data/overlays/pongHUD.oxo	6757-6997
/code/branches/ppspickups4/data/overlays/pongHUD.oxo	7003-7089
/code/branches/presentation2/data/overlays/pongHUD.oxo	6106-6416,7787-7800
/code/branches/presentation3/data/overlays/pongHUD.oxo	6913-7162
/code/branches/questsystem/data/overlays/pongHUD.oxo	1894-2088
/code/branches/questsystem2/data/overlays/pongHUD.oxo	2107-2259
/code/branches/questsystem5/data/overlays/pongHUD.oxo	2776-2905
/code/branches/releasetodo/data/overlays/pongHUD.oxo	7614-7647
/code/branches/resource/data/overlays/pongHUD.oxo	3327-3366
/code/branches/resource2/data/overlays/pongHUD.oxo	3372-5694
/code/branches/rocket/data/overlays/pongHUD.oxo	6523-6950
/code/branches/rocket2/data/overlays/pongHUD.oxo	6953-6970
/code/branches/script_trigger/data/overlays/pongHUD.oxo	1295-1953,1955
/code/branches/skybox2/data/overlays/pongHUD.oxo	6559-6989
/code/branches/sound/data/overlays/pongHUD.oxo	2829-3010
/code/branches/sound3/data/overlays/pongHUD.oxo	5941-6102
/code/branches/spaceboundaries/data/overlays/pongHUD.oxo	8085-8457
/code/branches/spaceboundaries2/data/overlays/pongHUD.oxo	8460-8613
/code/branches/spacerace/data/overlays/pongHUD.oxo	8182-8630
/code/branches/steering/data/overlays/pongHUD.oxo	5949-6091,8140-8595
/code/branches/tetris/data/overlays/pongHUD.oxo	8100-8563
/code/branches/tutoriallevel/data/overlays/pongHUD.oxo	7827-8370
/code/branches/tutoriallevel2/data/overlays/pongHUD.oxo	8370-8452
/code/branches/tutoriallevel3/data/overlays/pongHUD.oxo	8453-8636
/code/branches/unity_build/data/overlays/pongHUD.oxo	8440-8716
/code/branches/weapon/data/overlays/pongHUD.oxo	1925-2094
/code/branches/weapon2/data/overlays/pongHUD.oxo	2107-2488
/code/branches/weapons/data/overlays/pongHUD.oxo	2897-3051,8143-8591
/code/branches/weaponsystem/data/overlays/pongHUD.oxo	2742-2890

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

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/overlays/stats.oxo	merged	eligible
/code/branches/environment3/data/overlays/stats.oxo	merged	eligible
/code/branches/formation/data/overlays/stats.oxo	merged	eligible
/code/branches/gamecontent/data/overlays/stats.oxo	merged	eligible
/code/branches/hud/data/overlays/stats.oxo	merged	eligible
/code/branches/masterserverfix/data/overlays/stats.oxo	merged	eligible
/code/branches/menue/data/overlays/stats.oxo	merged	eligible
/code/branches/newlevel2012/data/overlays/stats.oxo	merged	eligible
/code/branches/output/data/overlays/stats.oxo	merged	eligible
/code/branches/pickup2012/data/overlays/stats.oxo	merged	eligible
/code/branches/presentation/data/overlays/stats.oxo	merged	eligible
/code/branches/presentation2011/data/overlays/stats.oxo	merged	eligible
/code/branches/shipSelection/data/overlays/stats.oxo	merged	eligible
/code/branches/sound2012/data/overlays/stats.oxo	merged	eligible
/code/branches/spacegate/data/overlays/stats.oxo	merged	eligible
/code/branches/spaceraceTwo/data/overlays/stats.oxo	merged	eligible
/code/branches/surfaceRace/data/overlays/stats.oxo	merged	eligible
/code/branches/usability/data/overlays/stats.oxo	merged	eligible
/code/trunk/data/overlays/stats.oxo	merged	eligible
/code/branches/ai/data/overlays/stats.oxo	6592-7033
/code/branches/ai2/data/overlays/stats.oxo	8721-8880
/code/branches/bigships/data/overlays/stats.oxo	8137-8588
/code/branches/buildsystem/data/overlays/stats.oxo	1874-2276,2278-2400
/code/branches/buildsystem2/data/overlays/stats.oxo	2506-2658
/code/branches/buildsystem3/data/overlays/stats.oxo	2662-2708
/code/branches/ceguilua/data/overlays/stats.oxo	1802-1808
/code/branches/chat/data/overlays/stats.oxo	6527-6797
/code/branches/chat2/data/overlays/stats.oxo	6836-6910
/code/branches/console/data/overlays/stats.oxo	5941-6104
/code/branches/consolecommands2/data/overlays/stats.oxo	6451-7178
/code/branches/consolecommands3/data/overlays/stats.oxo	7178-7283
/code/branches/core3/data/overlays/stats.oxo	1572-1739
/code/branches/core4/data/overlays/stats.oxo	3221-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.oxo	5768-5928,6009
/code/branches/data_cleanup/data/overlays/stats.oxo	7537-7686
/code/branches/doc/data/overlays/stats.oxo	7290-7400
/code/branches/dockingsystem/data/overlays/stats.oxo	8101-8192
/code/branches/dynamicmatch/data/overlays/stats.oxo	6584-7030
/code/branches/fps/data/overlays/stats.oxo	6591-7072
/code/branches/gameimmersion/data/overlays/stats.oxo	8102-8577
/code/branches/gamestate/data/overlays/stats.oxo	6430-6572,6621-6661
/code/branches/gamestates2/data/overlays/stats.oxo	6594-6745
/code/branches/gametypes/data/overlays/stats.oxo	2826-3031
/code/branches/gcc43/data/overlays/stats.oxo	1580
/code/branches/gui/data/overlays/stats.oxo	1635-1723,2795-2894
/code/branches/hudelements/data/overlays/stats.oxo	6584-6941
/code/branches/hudimprovements/data/overlays/stats.oxo	7920-8672
/code/branches/ingamemenu/data/overlays/stats.oxo	6000-6023
/code/branches/input/data/overlays/stats.oxo	1629-1636
/code/branches/ipv6/data/overlays/stats.oxo	7293-7458
/code/branches/kicklib/data/overlays/stats.oxo	7940-8096,8098-8277
/code/branches/kicklib2/data/overlays/stats.oxo	8282-8350
/code/branches/lastmanstanding/data/overlays/stats.oxo	7479-7644
/code/branches/lastmanstanding3/data/overlays/stats.oxo	7903-8175
/code/branches/libraries/data/overlays/stats.oxo	5612-5692
/code/branches/libraries2/data/overlays/stats.oxo	5703-5737
/code/branches/lod/data/overlays/stats.oxo	6586-6911
/code/branches/lodfinal/data/overlays/stats.oxo	2372-2411
/code/branches/mac_osx/data/overlays/stats.oxo	7789-8128,8135
/code/branches/map/data/overlays/stats.oxo	2801-3086,3089
/code/branches/masterserver/data/overlays/stats.oxo	7502-7738
/code/branches/menu/data/overlays/stats.oxo	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/overlays/stats.oxo	2754-2824
/code/branches/netp2/data/overlays/stats.oxo	2835-2988
/code/branches/netp3/data/overlays/stats.oxo	2988-3082
/code/branches/netp6/data/overlays/stats.oxo	3214-3302
/code/branches/network/data/overlays/stats.oxo	2356
/code/branches/network2/data/overlays/stats.oxo	6434-6465
/code/branches/network3/data/overlays/stats.oxo	7196-7344
/code/branches/network4/data/overlays/stats.oxo	7497-7755
/code/branches/network5/data/overlays/stats.oxo	7757-7781
/code/branches/network6/data/overlays/stats.oxo	7823-8315
/code/branches/network64/data/overlays/stats.oxo	2210-2355
/code/branches/notifications/data/overlays/stats.oxo	7314-7401
/code/branches/objecthierarchy/data/overlays/stats.oxo	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/overlays/stats.oxo	2171-2479
/code/branches/ois_update/data/overlays/stats.oxo	7506-7788
/code/branches/overlay/data/overlays/stats.oxo	2117-2385
/code/branches/particles/data/overlays/stats.oxo	2829-3085
/code/branches/particles2/data/overlays/stats.oxo	6050-6106,6109
/code/branches/pch/data/overlays/stats.oxo	3113-3194
/code/branches/physics/data/overlays/stats.oxo	1912-2055,2107-2439
/code/branches/physics_merge/data/overlays/stats.oxo	2436-2457
/code/branches/pickup/data/overlays/stats.oxo	8145-8555
/code/branches/pickup2/data/overlays/stats.oxo	5942-6405
/code/branches/pickup3/data/overlays/stats.oxo	6418-6523
/code/branches/pickup4/data/overlays/stats.oxo	6594-6710
/code/branches/pickups/data/overlays/stats.oxo	1926-2086,2127,2827-2915
/code/branches/pickups2/data/overlays/stats.oxo	2107-2497,2915-3071
/code/branches/png2/data/overlays/stats.oxo	7262-7263
/code/branches/portals/data/overlays/stats.oxo	8087-8455
/code/branches/portals2/data/overlays/stats.oxo	8460-8602
/code/branches/ppspickups1/data/overlays/stats.oxo	6552-6708
/code/branches/ppspickups2/data/overlays/stats.oxo	6527-6532,6554-6709
/code/branches/ppspickups3/data/overlays/stats.oxo	6757-6997
/code/branches/ppspickups4/data/overlays/stats.oxo	7003-7089
/code/branches/presentation2/data/overlays/stats.oxo	6106-6416,7787-7800
/code/branches/presentation3/data/overlays/stats.oxo	6913-7162
/code/branches/questsystem/data/overlays/stats.oxo	1894-2088
/code/branches/questsystem2/data/overlays/stats.oxo	2107-2259
/code/branches/questsystem5/data/overlays/stats.oxo	2776-2905
/code/branches/releasetodo/data/overlays/stats.oxo	7614-7647
/code/branches/resource/data/overlays/stats.oxo	3327-3366
/code/branches/resource2/data/overlays/stats.oxo	3372-5694
/code/branches/rocket/data/overlays/stats.oxo	6523-6950
/code/branches/rocket2/data/overlays/stats.oxo	6953-6970
/code/branches/script_trigger/data/overlays/stats.oxo	1295-1953,1955
/code/branches/skybox2/data/overlays/stats.oxo	6559-6989
/code/branches/sound/data/overlays/stats.oxo	2829-3010
/code/branches/sound3/data/overlays/stats.oxo	5941-6102
/code/branches/spaceboundaries/data/overlays/stats.oxo	8085-8457
/code/branches/spaceboundaries2/data/overlays/stats.oxo	8460-8613
/code/branches/spacerace/data/overlays/stats.oxo	8182-8630
/code/branches/steering/data/overlays/stats.oxo	5949-6091,8140-8595
/code/branches/tetris/data/overlays/stats.oxo	8100-8563
/code/branches/tutoriallevel/data/overlays/stats.oxo	7827-8370
/code/branches/tutoriallevel2/data/overlays/stats.oxo	8370-8452
/code/branches/tutoriallevel3/data/overlays/stats.oxo	8453-8636
/code/branches/unity_build/data/overlays/stats.oxo	8440-8716
/code/branches/weapon/data/overlays/stats.oxo	1925-2094
/code/branches/weapon2/data/overlays/stats.oxo	2107-2488
/code/branches/weapons/data/overlays/stats.oxo	2897-3051,8143-8591
/code/branches/weaponsystem/data/overlays/stats.oxo	2742-2890

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

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/environment3/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/formation/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/gamecontent/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/hud/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/masterserverfix/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/menue/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/newlevel2012/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/output/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/pickup2012/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/presentation/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/presentation2011/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/shipSelection/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/sound2012/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/spacegate/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/spaceraceTwo/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/surfaceRace/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/usability/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/trunk/data/overlays/teamBaseMatchHUD.oxo	merged	eligible
/code/branches/ai/data/overlays/teamBaseMatchHUD.oxo	6592-7033
/code/branches/ai2/data/overlays/teamBaseMatchHUD.oxo	8721-8880
/code/branches/bigships/data/overlays/teamBaseMatchHUD.oxo	8137-8588
/code/branches/buildsystem/data/overlays/teamBaseMatchHUD.oxo	1874-2276,2278-2400
/code/branches/buildsystem2/data/overlays/teamBaseMatchHUD.oxo	2506-2658
/code/branches/buildsystem3/data/overlays/teamBaseMatchHUD.oxo	2662-2708
/code/branches/ceguilua/data/overlays/teamBaseMatchHUD.oxo	1802-1808
/code/branches/chat/data/overlays/teamBaseMatchHUD.oxo	6527-6797
/code/branches/chat2/data/overlays/teamBaseMatchHUD.oxo	6836-6910
/code/branches/console/data/overlays/teamBaseMatchHUD.oxo	5941-6104
/code/branches/consolecommands2/data/overlays/teamBaseMatchHUD.oxo	6451-7178
/code/branches/consolecommands3/data/overlays/teamBaseMatchHUD.oxo	7178-7283
/code/branches/core3/data/overlays/teamBaseMatchHUD.oxo	1572-1739
/code/branches/core4/data/overlays/teamBaseMatchHUD.oxo	3221-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.oxo	5768-5928,6009
/code/branches/data_cleanup/data/overlays/teamBaseMatchHUD.oxo	7537-7686
/code/branches/doc/data/overlays/teamBaseMatchHUD.oxo	7290-7400
/code/branches/dockingsystem/data/overlays/teamBaseMatchHUD.oxo	8101-8192
/code/branches/dynamicmatch/data/overlays/teamBaseMatchHUD.oxo	6584-7030
/code/branches/fps/data/overlays/teamBaseMatchHUD.oxo	6591-7072
/code/branches/gameimmersion/data/overlays/teamBaseMatchHUD.oxo	8102-8577
/code/branches/gamestate/data/overlays/teamBaseMatchHUD.oxo	6430-6572,6621-6661
/code/branches/gamestates2/data/overlays/teamBaseMatchHUD.oxo	6594-6745
/code/branches/gametypes/data/overlays/teamBaseMatchHUD.oxo	2826-3031
/code/branches/gcc43/data/overlays/teamBaseMatchHUD.oxo	1580
/code/branches/gui/data/overlays/teamBaseMatchHUD.oxo	1635-1723,2795-2894
/code/branches/hudelements/data/overlays/teamBaseMatchHUD.oxo	6584-6941
/code/branches/hudimprovements/data/overlays/teamBaseMatchHUD.oxo	7920-8672
/code/branches/ingamemenu/data/overlays/teamBaseMatchHUD.oxo	6000-6023
/code/branches/input/data/overlays/teamBaseMatchHUD.oxo	1629-1636
/code/branches/ipv6/data/overlays/teamBaseMatchHUD.oxo	7293-7458
/code/branches/kicklib/data/overlays/teamBaseMatchHUD.oxo	7940-8096,8098-8277
/code/branches/kicklib2/data/overlays/teamBaseMatchHUD.oxo	8282-8350
/code/branches/lastmanstanding/data/overlays/teamBaseMatchHUD.oxo	7479-7644
/code/branches/lastmanstanding3/data/overlays/teamBaseMatchHUD.oxo	7903-8175
/code/branches/libraries/data/overlays/teamBaseMatchHUD.oxo	5612-5692
/code/branches/libraries2/data/overlays/teamBaseMatchHUD.oxo	5703-5737
/code/branches/lod/data/overlays/teamBaseMatchHUD.oxo	6586-6911
/code/branches/lodfinal/data/overlays/teamBaseMatchHUD.oxo	2372-2411
/code/branches/mac_osx/data/overlays/teamBaseMatchHUD.oxo	7789-8128,8135
/code/branches/map/data/overlays/teamBaseMatchHUD.oxo	2801-3086,3089
/code/branches/masterserver/data/overlays/teamBaseMatchHUD.oxo	7502-7738
/code/branches/menu/data/overlays/teamBaseMatchHUD.oxo	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/overlays/teamBaseMatchHUD.oxo	2754-2824
/code/branches/netp2/data/overlays/teamBaseMatchHUD.oxo	2835-2988
/code/branches/netp3/data/overlays/teamBaseMatchHUD.oxo	2988-3082
/code/branches/netp6/data/overlays/teamBaseMatchHUD.oxo	3214-3302
/code/branches/network/data/overlays/teamBaseMatchHUD.oxo	2356
/code/branches/network2/data/overlays/teamBaseMatchHUD.oxo	6434-6465
/code/branches/network3/data/overlays/teamBaseMatchHUD.oxo	7196-7344
/code/branches/network4/data/overlays/teamBaseMatchHUD.oxo	7497-7755
/code/branches/network5/data/overlays/teamBaseMatchHUD.oxo	7757-7781
/code/branches/network6/data/overlays/teamBaseMatchHUD.oxo	7823-8315
/code/branches/network64/data/overlays/teamBaseMatchHUD.oxo	2210-2355
/code/branches/notifications/data/overlays/teamBaseMatchHUD.oxo	7314-7401
/code/branches/objecthierarchy/data/overlays/teamBaseMatchHUD.oxo	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/overlays/teamBaseMatchHUD.oxo	2171-2479
/code/branches/ois_update/data/overlays/teamBaseMatchHUD.oxo	7506-7788
/code/branches/overlay/data/overlays/teamBaseMatchHUD.oxo	2117-2385
/code/branches/particles/data/overlays/teamBaseMatchHUD.oxo	2829-3085
/code/branches/particles2/data/overlays/teamBaseMatchHUD.oxo	6050-6106,6109
/code/branches/pch/data/overlays/teamBaseMatchHUD.oxo	3113-3194
/code/branches/physics/data/overlays/teamBaseMatchHUD.oxo	1912-2055,2107-2439
/code/branches/physics_merge/data/overlays/teamBaseMatchHUD.oxo	2436-2457
/code/branches/pickup/data/overlays/teamBaseMatchHUD.oxo	8145-8555
/code/branches/pickup2/data/overlays/teamBaseMatchHUD.oxo	5942-6405
/code/branches/pickup3/data/overlays/teamBaseMatchHUD.oxo	6418-6523
/code/branches/pickup4/data/overlays/teamBaseMatchHUD.oxo	6594-6710
/code/branches/pickups/data/overlays/teamBaseMatchHUD.oxo	1926-2086,2127,2827-2915
/code/branches/pickups2/data/overlays/teamBaseMatchHUD.oxo	2107-2497,2915-3071
/code/branches/png2/data/overlays/teamBaseMatchHUD.oxo	7262-7263
/code/branches/portals/data/overlays/teamBaseMatchHUD.oxo	8087-8455
/code/branches/portals2/data/overlays/teamBaseMatchHUD.oxo	8460-8602
/code/branches/ppspickups1/data/overlays/teamBaseMatchHUD.oxo	6552-6708
/code/branches/ppspickups2/data/overlays/teamBaseMatchHUD.oxo	6527-6532,6554-6709
/code/branches/ppspickups3/data/overlays/teamBaseMatchHUD.oxo	6757-6997
/code/branches/ppspickups4/data/overlays/teamBaseMatchHUD.oxo	7003-7089
/code/branches/presentation2/data/overlays/teamBaseMatchHUD.oxo	6106-6416,7787-7800
/code/branches/presentation3/data/overlays/teamBaseMatchHUD.oxo	6913-7162
/code/branches/questsystem/data/overlays/teamBaseMatchHUD.oxo	1894-2088
/code/branches/questsystem2/data/overlays/teamBaseMatchHUD.oxo	2107-2259
/code/branches/questsystem5/data/overlays/teamBaseMatchHUD.oxo	2776-2905
/code/branches/releasetodo/data/overlays/teamBaseMatchHUD.oxo	7614-7647
/code/branches/resource/data/overlays/teamBaseMatchHUD.oxo	3327-3366
/code/branches/resource2/data/overlays/teamBaseMatchHUD.oxo	3372-5694
/code/branches/rocket/data/overlays/teamBaseMatchHUD.oxo	6523-6950
/code/branches/rocket2/data/overlays/teamBaseMatchHUD.oxo	6953-6970
/code/branches/script_trigger/data/overlays/teamBaseMatchHUD.oxo	1295-1953,1955
/code/branches/skybox2/data/overlays/teamBaseMatchHUD.oxo	6559-6989
/code/branches/sound/data/overlays/teamBaseMatchHUD.oxo	2829-3010
/code/branches/sound3/data/overlays/teamBaseMatchHUD.oxo	5941-6102
/code/branches/spaceboundaries/data/overlays/teamBaseMatchHUD.oxo	8085-8457
/code/branches/spaceboundaries2/data/overlays/teamBaseMatchHUD.oxo	8460-8613
/code/branches/spacerace/data/overlays/teamBaseMatchHUD.oxo	8182-8630
/code/branches/steering/data/overlays/teamBaseMatchHUD.oxo	5949-6091,8140-8595
/code/branches/tetris/data/overlays/teamBaseMatchHUD.oxo	8100-8563
/code/branches/tutoriallevel/data/overlays/teamBaseMatchHUD.oxo	7827-8370
/code/branches/tutoriallevel2/data/overlays/teamBaseMatchHUD.oxo	8370-8452
/code/branches/tutoriallevel3/data/overlays/teamBaseMatchHUD.oxo	8453-8636
/code/branches/unity_build/data/overlays/teamBaseMatchHUD.oxo	8440-8716
/code/branches/weapon/data/overlays/teamBaseMatchHUD.oxo	1925-2094
/code/branches/weapon2/data/overlays/teamBaseMatchHUD.oxo	2107-2488
/code/branches/weapons/data/overlays/teamBaseMatchHUD.oxo	2897-3051,8143-8591
/code/branches/weaponsystem/data/overlays/teamBaseMatchHUD.oxo	2742-2890

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

Property svn:mergeinfo set to (toggle deleted branches)

/code/branches/dockingsystem2/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/environment3/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/formation/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/gamecontent/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/hud/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/masterserverfix/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/menue/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/newlevel2012/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/output/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/pickup2012/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/presentation/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/presentation2011/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/shipSelection/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/sound2012/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/spacegate/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/spaceraceTwo/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/surfaceRace/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/usability/data/overlays/underAttackHUD.oxo	merged	eligible
/code/trunk/data/overlays/underAttackHUD.oxo	merged	eligible
/code/branches/ai/data/overlays/underAttackHUD.oxo	6592-7033
/code/branches/ai2/data/overlays/underAttackHUD.oxo	8721-8880
/code/branches/bigships/data/overlays/underAttackHUD.oxo	8137-8588
/code/branches/buildsystem/data/overlays/underAttackHUD.oxo	1874-2276,2278-2400
/code/branches/buildsystem2/data/overlays/underAttackHUD.oxo	2506-2658
/code/branches/buildsystem3/data/overlays/underAttackHUD.oxo	2662-2708
/code/branches/ceguilua/data/overlays/underAttackHUD.oxo	1802-1808
/code/branches/chat/data/overlays/underAttackHUD.oxo	6527-6797
/code/branches/chat2/data/overlays/underAttackHUD.oxo	6836-6910
/code/branches/console/data/overlays/underAttackHUD.oxo	5941-6104
/code/branches/consolecommands2/data/overlays/underAttackHUD.oxo	6451-7178
/code/branches/consolecommands3/data/overlays/underAttackHUD.oxo	7178-7283
/code/branches/core3/data/overlays/underAttackHUD.oxo	1572-1739
/code/branches/core4/data/overlays/underAttackHUD.oxo	3221-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.oxo	5768-5928,6009
/code/branches/data_cleanup/data/overlays/underAttackHUD.oxo	7537-7686
/code/branches/doc/data/overlays/underAttackHUD.oxo	7290-7400
/code/branches/dockingsystem/data/overlays/underAttackHUD.oxo	8101-8192
/code/branches/dynamicmatch/data/overlays/underAttackHUD.oxo	6584-7030
/code/branches/fps/data/overlays/underAttackHUD.oxo	6591-7072
/code/branches/gameimmersion/data/overlays/underAttackHUD.oxo	8102-8577
/code/branches/gamestate/data/overlays/underAttackHUD.oxo	6430-6572,6621-6661
/code/branches/gamestates2/data/overlays/underAttackHUD.oxo	6594-6745
/code/branches/gametypes/data/overlays/underAttackHUD.oxo	2826-3031
/code/branches/gcc43/data/overlays/underAttackHUD.oxo	1580
/code/branches/gui/data/overlays/underAttackHUD.oxo	1635-1723,2795-2894
/code/branches/hudelements/data/overlays/underAttackHUD.oxo	6584-6941
/code/branches/hudimprovements/data/overlays/underAttackHUD.oxo	7920-8672
/code/branches/ingamemenu/data/overlays/underAttackHUD.oxo	6000-6023
/code/branches/input/data/overlays/underAttackHUD.oxo	1629-1636
/code/branches/ipv6/data/overlays/underAttackHUD.oxo	7293-7458
/code/branches/kicklib/data/overlays/underAttackHUD.oxo	7940-8096,8098-8277
/code/branches/kicklib2/data/overlays/underAttackHUD.oxo	8282-8350
/code/branches/lastmanstanding/data/overlays/underAttackHUD.oxo	7479-7644
/code/branches/lastmanstanding3/data/overlays/underAttackHUD.oxo	7903-8175
/code/branches/libraries/data/overlays/underAttackHUD.oxo	5612-5692
/code/branches/libraries2/data/overlays/underAttackHUD.oxo	5703-5737
/code/branches/lod/data/overlays/underAttackHUD.oxo	6586-6911
/code/branches/lodfinal/data/overlays/underAttackHUD.oxo	2372-2411
/code/branches/mac_osx/data/overlays/underAttackHUD.oxo	7789-8128,8135
/code/branches/map/data/overlays/underAttackHUD.oxo	2801-3086,3089
/code/branches/masterserver/data/overlays/underAttackHUD.oxo	7502-7738
/code/branches/menu/data/overlays/underAttackHUD.oxo	5941-6146,6148,7536-7687
/code/branches/miniprojects/data/overlays/underAttackHUD.oxo	2754-2824
/code/branches/netp2/data/overlays/underAttackHUD.oxo	2835-2988
/code/branches/netp3/data/overlays/underAttackHUD.oxo	2988-3082
/code/branches/netp6/data/overlays/underAttackHUD.oxo	3214-3302
/code/branches/network/data/overlays/underAttackHUD.oxo	2356
/code/branches/network2/data/overlays/underAttackHUD.oxo	6434-6465
/code/branches/network3/data/overlays/underAttackHUD.oxo	7196-7344
/code/branches/network4/data/overlays/underAttackHUD.oxo	7497-7755
/code/branches/network5/data/overlays/underAttackHUD.oxo	7757-7781
/code/branches/network6/data/overlays/underAttackHUD.oxo	7823-8315
/code/branches/network64/data/overlays/underAttackHUD.oxo	2210-2355
/code/branches/notifications/data/overlays/underAttackHUD.oxo	7314-7401
/code/branches/objecthierarchy/data/overlays/underAttackHUD.oxo	1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/data/overlays/underAttackHUD.oxo	2171-2479
/code/branches/ois_update/data/overlays/underAttackHUD.oxo	7506-7788
/code/branches/overlay/data/overlays/underAttackHUD.oxo	2117-2385
/code/branches/particles/data/overlays/underAttackHUD.oxo	2829-3085
/code/branches/particles2/data/overlays/underAttackHUD.oxo	6050-6106,6109
/code/branches/pch/data/overlays/underAttackHUD.oxo	3113-3194
/code/branches/physics/data/overlays/underAttackHUD.oxo	1912-2055,2107-2439
/code/branches/physics_merge/data/overlays/underAttackHUD.oxo	2436-2457
/code/branches/pickup/data/overlays/underAttackHUD.oxo	8145-8555
/code/branches/pickup2/data/overlays/underAttackHUD.oxo	5942-6405
/code/branches/pickup3/data/overlays/underAttackHUD.oxo	6418-6523
/code/branches/pickup4/data/overlays/underAttackHUD.oxo	6594-6710
/code/branches/pickups/data/overlays/underAttackHUD.oxo	1926-2086,2127,2827-2915
/code/branches/pickups2/data/overlays/underAttackHUD.oxo	2107-2497,2915-3071
/code/branches/png2/data/overlays/underAttackHUD.oxo	7262-7263
/code/branches/portals/data/overlays/underAttackHUD.oxo	8087-8455
/code/branches/portals2/data/overlays/underAttackHUD.oxo	8460-8602
/code/branches/ppspickups1/data/overlays/underAttackHUD.oxo	6552-6708
/code/branches/ppspickups2/data/overlays/underAttackHUD.oxo	6527-6532,6554-6709
/code/branches/ppspickups3/data/overlays/underAttackHUD.oxo	6757-6997
/code/branches/ppspickups4/data/overlays/underAttackHUD.oxo	7003-7089
/code/branches/presentation2/data/overlays/underAttackHUD.oxo	6106-6416,7787-7800
/code/branches/presentation3/data/overlays/underAttackHUD.oxo	6913-7162
/code/branches/questsystem/data/overlays/underAttackHUD.oxo	1894-2088
/code/branches/questsystem2/data/overlays/underAttackHUD.oxo	2107-2259
/code/branches/questsystem5/data/overlays/underAttackHUD.oxo	2776-2905
/code/branches/releasetodo/data/overlays/underAttackHUD.oxo	7614-7647
/code/branches/resource/data/overlays/underAttackHUD.oxo	3327-3366
/code/branches/resource2/data/overlays/underAttackHUD.oxo	3372-5694
/code/branches/rocket/data/overlays/underAttackHUD.oxo	6523-6950
/code/branches/rocket2/data/overlays/underAttackHUD.oxo	6953-6970
/code/branches/script_trigger/data/overlays/underAttackHUD.oxo	1295-1953,1955
/code/branches/skybox2/data/overlays/underAttackHUD.oxo	6559-6989
/code/branches/sound/data/overlays/underAttackHUD.oxo	2829-3010
/code/branches/sound3/data/overlays/underAttackHUD.oxo	5941-6102
/code/branches/spaceboundaries/data/overlays/underAttackHUD.oxo	8085-8457
/code/branches/spaceboundaries2/data/overlays/underAttackHUD.oxo	8460-8613
/code/branches/spacerace/data/overlays/underAttackHUD.oxo	8182-8630
/code/branches/steering/data/overlays/underAttackHUD.oxo	5949-6091,8140-8595
/code/branches/tetris/data/overlays/underAttackHUD.oxo	8100-8563
/code/branches/tutoriallevel/data/overlays/underAttackHUD.oxo	7827-8370
/code/branches/tutoriallevel2/data/overlays/underAttackHUD.oxo	8370-8452
/code/branches/tutoriallevel3/data/overlays/underAttackHUD.oxo	8453-8636
/code/branches/unity_build/data/overlays/underAttackHUD.oxo	8440-8716
/code/branches/weapon/data/overlays/underAttackHUD.oxo	1925-2094
/code/branches/weapon2/data/overlays/underAttackHUD.oxo	2107-2488
/code/branches/weapons/data/overlays/underAttackHUD.oxo	2897-3051,8143-8591
/code/branches/weaponsystem/data/overlays/underAttackHUD.oxo	2742-2890

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 9241 for code/branches/presentation2012/data

Legend:

Download in other formats: