[Orxonox-commit 4572] r9243 - in code/branches/presentation2012: . bin cmake contrib data data/levels data/levels/includes data/levels/old data/levels/templates data/overlays doc src src/modules src/modules/designtools src/modules/docking src/modules/gametypes src/modules/notifications src/modules/objects src/modules/overlays src/modules/pickup src/modules/pong src/modules/portals src/modules/questsystem src/modules/tetris src/modules/weapons
landauf at orxonox.net
landauf at orxonox.net
Thu May 24 21:33:32 CEST 2012
Author: landauf
Date: 2012-05-24 21:33:31 +0200 (Thu, 24 May 2012)
New Revision: 9243
Modified:
code/branches/presentation2012/CMakeLists.txt
code/branches/presentation2012/INSTALL
code/branches/presentation2012/LICENSE
code/branches/presentation2012/README
code/branches/presentation2012/bin/
code/branches/presentation2012/cmake/
code/branches/presentation2012/contrib/
code/branches/presentation2012/data/
code/branches/presentation2012/data/levels/
code/branches/presentation2012/data/levels/FPSTest.oxw
code/branches/presentation2012/data/levels/Spacerace2.oxw
code/branches/presentation2012/data/levels/asteroidField.oxw
code/branches/presentation2012/data/levels/asteroids.oxw
code/branches/presentation2012/data/levels/docking.oxw
code/branches/presentation2012/data/levels/dynamicMatch.oxw
code/branches/presentation2012/data/levels/earth.oxw
code/branches/presentation2012/data/levels/emptyLevel.oxw
code/branches/presentation2012/data/levels/events.oxw
code/branches/presentation2012/data/levels/fightInOurBack.oxw
code/branches/presentation2012/data/levels/includes/
code/branches/presentation2012/data/levels/includes/CuboidSpaceStation.lua
code/branches/presentation2012/data/levels/includes/asteroidField.lua
code/branches/presentation2012/data/levels/includes/notifications.oxi
code/branches/presentation2012/data/levels/includes/pickups.oxi
code/branches/presentation2012/data/levels/includes/weaponSettingsAssff.oxi
code/branches/presentation2012/data/levels/includes/weaponSettingsAssff2.oxi
code/branches/presentation2012/data/levels/includes/weaponSettingsFPS.oxi
code/branches/presentation2012/data/levels/includes/weaponSettingsGhost.oxi
code/branches/presentation2012/data/levels/includes/weaponSettingsH2.oxi
code/branches/presentation2012/data/levels/includes/weaponSettingsHXY.oxi
code/branches/presentation2012/data/levels/includes/weaponSettingsImmTest.oxi
code/branches/presentation2012/data/levels/includes/weaponSettingsPirate.oxi
code/branches/presentation2012/data/levels/includes/weaponSettingsSpacecruiser.oxi
code/branches/presentation2012/data/levels/includes/weaponSettingsSwallow.oxi
code/branches/presentation2012/data/levels/includes/weaponSettingsTransporter.oxi
code/branches/presentation2012/data/levels/lastManStanding.oxw
code/branches/presentation2012/data/levels/lastTeamStanding.oxw
code/branches/presentation2012/data/levels/lastTeamStandingII.oxw
code/branches/presentation2012/data/levels/missionOne.oxw
code/branches/presentation2012/data/levels/myTestLevel.oxw
code/branches/presentation2012/data/levels/notifications.oxw
code/branches/presentation2012/data/levels/old/
code/branches/presentation2012/data/levels/pickups.oxw
code/branches/presentation2012/data/levels/pirateAttack.oxw
code/branches/presentation2012/data/levels/planets.oxw
code/branches/presentation2012/data/levels/pong.oxw
code/branches/presentation2012/data/levels/portals.oxw
code/branches/presentation2012/data/levels/presentation.oxw
code/branches/presentation2012/data/levels/presentation09.oxw
code/branches/presentation2012/data/levels/presentation09b.oxw
code/branches/presentation2012/data/levels/presentationDM.oxw
code/branches/presentation2012/data/levels/presentationFS10.oxw
code/branches/presentation2012/data/levels/presentationFS102.oxw
code/branches/presentation2012/data/levels/presentationFS10Ed.oxw
code/branches/presentation2012/data/levels/presentationFS11.oxw
code/branches/presentation2012/data/levels/presentationHS09.oxw
code/branches/presentation2012/data/levels/presentationHS09b.oxw
code/branches/presentation2012/data/levels/presentationHS11.oxw
code/branches/presentation2012/data/levels/princessAeryn.oxw
code/branches/presentation2012/data/levels/quests.oxw
code/branches/presentation2012/data/levels/screenshot.oxw
code/branches/presentation2012/data/levels/shieldTest.oxw
code/branches/presentation2012/data/levels/sound.oxw
code/branches/presentation2012/data/levels/spaceRace.oxw
code/branches/presentation2012/data/levels/surfaceRace.oxw
code/branches/presentation2012/data/levels/teamBaseMatch.oxw
code/branches/presentation2012/data/levels/teamDeathMatch.oxw
code/branches/presentation2012/data/levels/templates/
code/branches/presentation2012/data/levels/templates/FPS.oxt
code/branches/presentation2012/data/levels/templates/lodInformation.oxt
code/branches/presentation2012/data/levels/templates/pickupRepresentationTemplates.oxt
code/branches/presentation2012/data/levels/templates/spaceshipAssff.oxt
code/branches/presentation2012/data/levels/templates/spaceshipAssff2.oxt
code/branches/presentation2012/data/levels/templates/spaceshipGhost.oxt
code/branches/presentation2012/data/levels/templates/spaceshipH2.oxt
code/branches/presentation2012/data/levels/templates/spaceshipHXY.oxt
code/branches/presentation2012/data/levels/templates/spaceshipHXYSL.oxt
code/branches/presentation2012/data/levels/templates/spaceshipPirate.oxt
code/branches/presentation2012/data/levels/templates/spaceshipRace.oxt
code/branches/presentation2012/data/levels/templates/spaceshipSpacecruiser.oxt
code/branches/presentation2012/data/levels/templates/spaceshipSwallow.oxt
code/branches/presentation2012/data/levels/templates/spaceshipTransporter.oxt
code/branches/presentation2012/data/levels/templates/spaceshipTransporterSL.oxt
code/branches/presentation2012/data/levels/testStars.oxw
code/branches/presentation2012/data/levels/testSwallow.oxw
code/branches/presentation2012/data/levels/tetris.oxw
code/branches/presentation2012/data/levels/theTimeMachine.oxw
code/branches/presentation2012/data/levels/tutorial.oxw
code/branches/presentation2012/data/levels/underAttack.oxw
code/branches/presentation2012/data/levels/waypoints.oxw
code/branches/presentation2012/data/overlays/
code/branches/presentation2012/data/overlays/HUD.oxo
code/branches/presentation2012/data/overlays/HUDTemplates3.oxo
code/branches/presentation2012/data/overlays/HUDTemplatesFPS.oxo
code/branches/presentation2012/data/overlays/debug.oxo
code/branches/presentation2012/data/overlays/dynamicMatchHUD.oxo
code/branches/presentation2012/data/overlays/lastManStandingHUD.oxo
code/branches/presentation2012/data/overlays/lastTeamStandingHUD.oxo
code/branches/presentation2012/data/overlays/pongHUD.oxo
code/branches/presentation2012/data/overlays/stats.oxo
code/branches/presentation2012/data/overlays/teamBaseMatchHUD.oxo
code/branches/presentation2012/data/overlays/underAttackHUD.oxo
code/branches/presentation2012/doc/
code/branches/presentation2012/src/
code/branches/presentation2012/src/modules/
code/branches/presentation2012/src/modules/CMakeLists.txt
code/branches/presentation2012/src/modules/designtools/
code/branches/presentation2012/src/modules/docking/
code/branches/presentation2012/src/modules/gametypes/
code/branches/presentation2012/src/modules/notifications/
code/branches/presentation2012/src/modules/objects/
code/branches/presentation2012/src/modules/overlays/
code/branches/presentation2012/src/modules/pickup/
code/branches/presentation2012/src/modules/pong/
code/branches/presentation2012/src/modules/portals/
code/branches/presentation2012/src/modules/questsystem/
code/branches/presentation2012/src/modules/tetris/
code/branches/presentation2012/src/modules/weapons/
Log:
removed accidental svn:mergeinfo from r9241
Property changes on: code/branches/presentation2012/CMakeLists.txt
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/CMakeLists.txt:6592-7033
/code/branches/ai2/CMakeLists.txt:8721-8880
/code/branches/bigships/CMakeLists.txt:8137-8588
/code/branches/buildsystem/CMakeLists.txt:1874-2276,2278-2400
/code/branches/buildsystem2/CMakeLists.txt:2506-2658
/code/branches/buildsystem3/CMakeLists.txt:2662-2708
/code/branches/ceguilua/CMakeLists.txt:1802-1808
/code/branches/chat/CMakeLists.txt:6527-6797
/code/branches/chat2/CMakeLists.txt:6836-6910
/code/branches/console/CMakeLists.txt:5941-6104
/code/branches/consolecommands2/CMakeLists.txt:6451-7178
/code/branches/consolecommands3/CMakeLists.txt:7178-7283
/code/branches/core3/CMakeLists.txt:1572-1739
/code/branches/core4/CMakeLists.txt: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/CMakeLists.txt:5768-5928,6009
/code/branches/data_cleanup/CMakeLists.txt:7537-7686
/code/branches/doc/CMakeLists.txt:7290-7400
/code/branches/dockingsystem/CMakeLists.txt:8101-8192
/code/branches/dockingsystem2/CMakeLists.txt:8196-8560
/code/branches/dynamicmatch/CMakeLists.txt:6584-7030
/code/branches/environment3/CMakeLists.txt:8887-8975
/code/branches/formation/CMakeLists.txt:8885-8991
/code/branches/fps/CMakeLists.txt:6591-7072
/code/branches/gamecontent/CMakeLists.txt:8893-8968
/code/branches/gameimmersion/CMakeLists.txt:8102-8577
/code/branches/gamestate/CMakeLists.txt:6430-6572,6621-6661
/code/branches/gamestates2/CMakeLists.txt:6594-6745
/code/branches/gametypes/CMakeLists.txt:2826-3031
/code/branches/gcc43/CMakeLists.txt:1580
/code/branches/gui/CMakeLists.txt:1635-1723,2795-2894
/code/branches/hud/CMakeLists.txt:8883-8986
/code/branches/hudelements/CMakeLists.txt:6584-6941
/code/branches/hudimprovements/CMakeLists.txt:7920-8672
/code/branches/ingamemenu/CMakeLists.txt:6000-6023
/code/branches/input/CMakeLists.txt:1629-1636
/code/branches/ipv6/CMakeLists.txt:7293-7458
/code/branches/kicklib/CMakeLists.txt:7940-8096,8098-8277
/code/branches/kicklib2/CMakeLists.txt:8282-8350
/code/branches/lastmanstanding/CMakeLists.txt:7479-7644
/code/branches/lastmanstanding3/CMakeLists.txt:7903-8175
/code/branches/libraries/CMakeLists.txt:5612-5692
/code/branches/libraries2/CMakeLists.txt:5703-5737
/code/branches/lod/CMakeLists.txt:6586-6911
/code/branches/lodfinal/CMakeLists.txt:2372-2411
/code/branches/mac_osx/CMakeLists.txt:7789-8128,8135
/code/branches/map/CMakeLists.txt:2801-3086,3089
/code/branches/masterserver/CMakeLists.txt:7502-7738
/code/branches/masterserverfix/CMakeLists.txt:8933-8936
/code/branches/menu/CMakeLists.txt:5941-6146,6148,7536-7687
/code/branches/menue/CMakeLists.txt:8884-8976
/code/branches/miniprojects/CMakeLists.txt:2754-2824
/code/branches/netp2/CMakeLists.txt:2835-2988
/code/branches/netp3/CMakeLists.txt:2988-3082
/code/branches/netp6/CMakeLists.txt:3214-3302
/code/branches/network/CMakeLists.txt:2356
/code/branches/network2/CMakeLists.txt:6434-6465
/code/branches/network3/CMakeLists.txt:7196-7344
/code/branches/network4/CMakeLists.txt:7497-7755
/code/branches/network5/CMakeLists.txt:7757-7781
/code/branches/network6/CMakeLists.txt:7823-8315
/code/branches/network64/CMakeLists.txt:2210-2355
/code/branches/newlevel2012/CMakeLists.txt:9033-9240
/code/branches/notifications/CMakeLists.txt:7314-7401
/code/branches/objecthierarchy/CMakeLists.txt:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/CMakeLists.txt:2171-2479
/code/branches/ois_update/CMakeLists.txt:7506-7788
/code/branches/output/CMakeLists.txt:8739-8857
/code/branches/overlay/CMakeLists.txt:2117-2385
/code/branches/particles/CMakeLists.txt:2829-3085
/code/branches/particles2/CMakeLists.txt:6050-6106,6109
/code/branches/pch/CMakeLists.txt:3113-3194
/code/branches/physics/CMakeLists.txt:1912-2055,2107-2439
/code/branches/physics_merge/CMakeLists.txt:2436-2457
/code/branches/pickup/CMakeLists.txt:8145-8555
/code/branches/pickup2/CMakeLists.txt:5942-6405
/code/branches/pickup2012/CMakeLists.txt:9029-9189
/code/branches/pickup3/CMakeLists.txt:6418-6523
/code/branches/pickup4/CMakeLists.txt:6594-6710
/code/branches/pickups/CMakeLists.txt:1926-2086,2127,2827-2915
/code/branches/pickups2/CMakeLists.txt:2107-2497,2915-3071
/code/branches/png2/CMakeLists.txt:7262-7263
/code/branches/portals/CMakeLists.txt:8087-8455
/code/branches/portals2/CMakeLists.txt:8460-8602
/code/branches/ppspickups1/CMakeLists.txt:6552-6708
/code/branches/ppspickups2/CMakeLists.txt:6527-6532,6554-6709
/code/branches/ppspickups3/CMakeLists.txt:6757-6997
/code/branches/ppspickups4/CMakeLists.txt:7003-7089
/code/branches/presentation/CMakeLists.txt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/CMakeLists.txt:6106-6416,7787-7800
/code/branches/presentation2011/CMakeLists.txt:8974-9015
/code/branches/presentation3/CMakeLists.txt:6913-7162
/code/branches/questsystem/CMakeLists.txt:1894-2088
/code/branches/questsystem2/CMakeLists.txt:2107-2259
/code/branches/questsystem5/CMakeLists.txt:2776-2905
/code/branches/releasetodo/CMakeLists.txt:7614-7647
/code/branches/resource/CMakeLists.txt:3327-3366
/code/branches/resource2/CMakeLists.txt:3372-5694
/code/branches/rocket/CMakeLists.txt:6523-6950
/code/branches/rocket2/CMakeLists.txt:6953-6970
/code/branches/script_trigger/CMakeLists.txt:1295-1953,1955
/code/branches/shipSelection/CMakeLists.txt:9038-9206
/code/branches/skybox2/CMakeLists.txt:6559-6989
/code/branches/sound/CMakeLists.txt:2829-3010
/code/branches/sound2012/CMakeLists.txt:9205-9240
/code/branches/sound3/CMakeLists.txt:5941-6102
/code/branches/spaceboundaries/CMakeLists.txt:8085-8457
/code/branches/spaceboundaries2/CMakeLists.txt:8460-8613
/code/branches/spacegate/CMakeLists.txt:9030-9215
/code/branches/spacerace/CMakeLists.txt:8182-8630
/code/branches/spaceraceTwo/CMakeLists.txt:8881-8996
/code/branches/steering/CMakeLists.txt:5949-6091,8140-8595
/code/branches/surfaceRace/CMakeLists.txt:9028-9199
/code/branches/tetris/CMakeLists.txt:8100-8563
/code/branches/tutoriallevel/CMakeLists.txt:7827-8370
/code/branches/tutoriallevel2/CMakeLists.txt:8370-8452
/code/branches/tutoriallevel3/CMakeLists.txt:8453-8636
/code/branches/unity_build/CMakeLists.txt:8440-8716
/code/branches/usability/CMakeLists.txt:7915-8078
/code/branches/weapon/CMakeLists.txt:1925-2094
/code/branches/weapon2/CMakeLists.txt:2107-2488
/code/branches/weapons/CMakeLists.txt:2897-3051,8143-8591
/code/branches/weaponsystem/CMakeLists.txt:2742-2890
/code/trunk/CMakeLists.txt:9189-9204
Property changes on: code/branches/presentation2012/INSTALL
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/INSTALL:6592-7033
/code/branches/ai2/INSTALL:8721-8880
/code/branches/bigships/INSTALL:8137-8588
/code/branches/buildsystem/INSTALL:1874-2276,2278-2400
/code/branches/buildsystem2/INSTALL:2506-2658
/code/branches/buildsystem3/INSTALL:2662-2708
/code/branches/ceguilua/INSTALL:1802-1808
/code/branches/chat/INSTALL:6527-6797
/code/branches/chat2/INSTALL:6836-6910
/code/branches/console/INSTALL:5941-6104
/code/branches/consolecommands2/INSTALL:6451-7178
/code/branches/consolecommands3/INSTALL:7178-7283
/code/branches/core3/INSTALL:1572-1739
/code/branches/core4/INSTALL: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/INSTALL:5768-5928,6009
/code/branches/data_cleanup/INSTALL:7537-7686
/code/branches/doc/INSTALL:7290-7400
/code/branches/dockingsystem/INSTALL:8101-8192
/code/branches/dockingsystem2/INSTALL:8196-8560
/code/branches/dynamicmatch/INSTALL:6584-7030
/code/branches/environment3/INSTALL:8887-8975
/code/branches/formation/INSTALL:8885-8991
/code/branches/fps/INSTALL:6591-7072
/code/branches/gamecontent/INSTALL:8893-8968
/code/branches/gameimmersion/INSTALL:8102-8577
/code/branches/gamestate/INSTALL:6430-6572,6621-6661
/code/branches/gamestates2/INSTALL:6594-6745
/code/branches/gametypes/INSTALL:2826-3031
/code/branches/gcc43/INSTALL:1580
/code/branches/gui/INSTALL:1635-1723,2795-2894
/code/branches/hud/INSTALL:8883-8986
/code/branches/hudelements/INSTALL:6584-6941
/code/branches/hudimprovements/INSTALL:7920-8672
/code/branches/ingamemenu/INSTALL:6000-6023
/code/branches/input/INSTALL:1629-1636
/code/branches/ipv6/INSTALL:7293-7458
/code/branches/kicklib/INSTALL:7940-8096,8098-8277
/code/branches/kicklib2/INSTALL:8282-8350
/code/branches/lastmanstanding/INSTALL:7479-7644
/code/branches/lastmanstanding3/INSTALL:7903-8175
/code/branches/libraries/INSTALL:5612-5692
/code/branches/libraries2/INSTALL:5703-5737
/code/branches/lod/INSTALL:6586-6911
/code/branches/lodfinal/INSTALL:2372-2411
/code/branches/mac_osx/INSTALL:7789-8128,8135
/code/branches/map/INSTALL:2801-3086,3089
/code/branches/masterserver/INSTALL:7502-7738
/code/branches/masterserverfix/INSTALL:8933-8936
/code/branches/menu/INSTALL:5941-6146,6148,7536-7687
/code/branches/menue/INSTALL:8884-8976
/code/branches/miniprojects/INSTALL:2754-2824
/code/branches/netp2/INSTALL:2835-2988
/code/branches/netp3/INSTALL:2988-3082
/code/branches/netp6/INSTALL:3214-3302
/code/branches/network/INSTALL:2356
/code/branches/network2/INSTALL:6434-6465
/code/branches/network3/INSTALL:7196-7344
/code/branches/network4/INSTALL:7497-7755
/code/branches/network5/INSTALL:7757-7781
/code/branches/network6/INSTALL:7823-8315
/code/branches/network64/INSTALL:2210-2355
/code/branches/newlevel2012/INSTALL:9033-9240
/code/branches/notifications/INSTALL:7314-7401
/code/branches/objecthierarchy/INSTALL:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/INSTALL:2171-2479
/code/branches/ois_update/INSTALL:7506-7788
/code/branches/output/INSTALL:8739-8857
/code/branches/overlay/INSTALL:2117-2385
/code/branches/particles/INSTALL:2829-3085
/code/branches/particles2/INSTALL:6050-6106,6109
/code/branches/pch/INSTALL:3113-3194
/code/branches/physics/INSTALL:1912-2055,2107-2439
/code/branches/physics_merge/INSTALL:2436-2457
/code/branches/pickup/INSTALL:8145-8555
/code/branches/pickup2/INSTALL:5942-6405
/code/branches/pickup2012/INSTALL:9029-9189
/code/branches/pickup3/INSTALL:6418-6523
/code/branches/pickup4/INSTALL:6594-6710
/code/branches/pickups/INSTALL:1926-2086,2127,2827-2915
/code/branches/pickups2/INSTALL:2107-2497,2915-3071
/code/branches/png2/INSTALL:7262-7263
/code/branches/portals/INSTALL:8087-8455
/code/branches/portals2/INSTALL:8460-8602
/code/branches/ppspickups1/INSTALL:6552-6708
/code/branches/ppspickups2/INSTALL:6527-6532,6554-6709
/code/branches/ppspickups3/INSTALL:6757-6997
/code/branches/ppspickups4/INSTALL:7003-7089
/code/branches/presentation/INSTALL:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/INSTALL:6106-6416,7787-7800
/code/branches/presentation2011/INSTALL:8974-9015
/code/branches/presentation3/INSTALL:6913-7162
/code/branches/questsystem/INSTALL:1894-2088
/code/branches/questsystem2/INSTALL:2107-2259
/code/branches/questsystem5/INSTALL:2776-2905
/code/branches/releasetodo/INSTALL:7614-7647
/code/branches/resource/INSTALL:3327-3366
/code/branches/resource2/INSTALL:3372-5694
/code/branches/rocket/INSTALL:6523-6950
/code/branches/rocket2/INSTALL:6953-6970
/code/branches/script_trigger/INSTALL:1295-1953,1955
/code/branches/shipSelection/INSTALL:9038-9206
/code/branches/skybox2/INSTALL:6559-6989
/code/branches/sound/INSTALL:2829-3010
/code/branches/sound2012/INSTALL:9205-9240
/code/branches/sound3/INSTALL:5941-6102
/code/branches/spaceboundaries/INSTALL:8085-8457
/code/branches/spaceboundaries2/INSTALL:8460-8613
/code/branches/spacegate/INSTALL:9030-9215
/code/branches/spacerace/INSTALL:8182-8630
/code/branches/spaceraceTwo/INSTALL:8881-8996
/code/branches/steering/INSTALL:5949-6091,8140-8595
/code/branches/surfaceRace/INSTALL:9028-9199
/code/branches/tetris/INSTALL:8100-8563
/code/branches/tutoriallevel/INSTALL:7827-8370
/code/branches/tutoriallevel2/INSTALL:8370-8452
/code/branches/tutoriallevel3/INSTALL:8453-8636
/code/branches/unity_build/INSTALL:8440-8716
/code/branches/usability/INSTALL:7915-8078
/code/branches/weapon/INSTALL:1925-2094
/code/branches/weapon2/INSTALL:2107-2488
/code/branches/weapons/INSTALL:2897-3051,8143-8591
/code/branches/weaponsystem/INSTALL:2742-2890
/code/trunk/INSTALL:9189-9204
Property changes on: code/branches/presentation2012/LICENSE
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/LICENSE:6592-7033
/code/branches/ai2/LICENSE:8721-8880
/code/branches/bigships/LICENSE:8137-8588
/code/branches/buildsystem/LICENSE:1874-2276,2278-2400
/code/branches/buildsystem2/LICENSE:2506-2658
/code/branches/buildsystem3/LICENSE:2662-2708
/code/branches/ceguilua/LICENSE:1802-1808
/code/branches/chat/LICENSE:6527-6797
/code/branches/chat2/LICENSE:6836-6910
/code/branches/console/LICENSE:5941-6104
/code/branches/consolecommands2/LICENSE:6451-7178
/code/branches/consolecommands3/LICENSE:7178-7283
/code/branches/core3/LICENSE:1572-1739
/code/branches/core4/LICENSE: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/LICENSE:5768-5928,6009
/code/branches/data_cleanup/LICENSE:7537-7686
/code/branches/doc/LICENSE:7290-7400
/code/branches/dockingsystem/LICENSE:8101-8192
/code/branches/dockingsystem2/LICENSE:8196-8560
/code/branches/dynamicmatch/LICENSE:6584-7030
/code/branches/environment3/LICENSE:8887-8975
/code/branches/formation/LICENSE:8885-8991
/code/branches/fps/LICENSE:6591-7072
/code/branches/gamecontent/LICENSE:8893-8968
/code/branches/gameimmersion/LICENSE:8102-8577
/code/branches/gamestate/LICENSE:6430-6572,6621-6661
/code/branches/gamestates2/LICENSE:6594-6745
/code/branches/gametypes/LICENSE:2826-3031
/code/branches/gcc43/LICENSE:1580
/code/branches/gui/LICENSE:1635-1723,2795-2894
/code/branches/hud/LICENSE:8883-8986
/code/branches/hudelements/LICENSE:6584-6941
/code/branches/hudimprovements/LICENSE:7920-8672
/code/branches/ingamemenu/LICENSE:6000-6023
/code/branches/input/LICENSE:1629-1636
/code/branches/ipv6/LICENSE:7293-7458
/code/branches/kicklib/LICENSE:7940-8096,8098-8277
/code/branches/kicklib2/LICENSE:8282-8350
/code/branches/lastmanstanding/LICENSE:7479-7644
/code/branches/lastmanstanding3/LICENSE:7903-8175
/code/branches/libraries/LICENSE:5612-5692
/code/branches/libraries2/LICENSE:5703-5737
/code/branches/lod/LICENSE:6586-6911
/code/branches/lodfinal/LICENSE:2372-2411
/code/branches/mac_osx/LICENSE:7789-8128,8135
/code/branches/map/LICENSE:2801-3086,3089
/code/branches/masterserver/LICENSE:7502-7738
/code/branches/masterserverfix/LICENSE:8933-8936
/code/branches/menu/LICENSE:5941-6146,6148,7536-7687
/code/branches/menue/LICENSE:8884-8976
/code/branches/miniprojects/LICENSE:2754-2824
/code/branches/netp2/LICENSE:2835-2988
/code/branches/netp3/LICENSE:2988-3082
/code/branches/netp6/LICENSE:3214-3302
/code/branches/network/LICENSE:2356
/code/branches/network2/LICENSE:6434-6465
/code/branches/network3/LICENSE:7196-7344
/code/branches/network4/LICENSE:7497-7755
/code/branches/network5/LICENSE:7757-7781
/code/branches/network6/LICENSE:7823-8315
/code/branches/network64/LICENSE:2210-2355
/code/branches/newlevel2012/LICENSE:9033-9240
/code/branches/notifications/LICENSE:7314-7401
/code/branches/objecthierarchy/LICENSE:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/LICENSE:2171-2479
/code/branches/ois_update/LICENSE:7506-7788
/code/branches/output/LICENSE:8739-8857
/code/branches/overlay/LICENSE:2117-2385
/code/branches/particles/LICENSE:2829-3085
/code/branches/particles2/LICENSE:6050-6106,6109
/code/branches/pch/LICENSE:3113-3194
/code/branches/physics/LICENSE:1912-2055,2107-2439
/code/branches/physics_merge/LICENSE:2436-2457
/code/branches/pickup/LICENSE:8145-8555
/code/branches/pickup2/LICENSE:5942-6405
/code/branches/pickup2012/LICENSE:9029-9189
/code/branches/pickup3/LICENSE:6418-6523
/code/branches/pickup4/LICENSE:6594-6710
/code/branches/pickups/LICENSE:1926-2086,2127,2827-2915
/code/branches/pickups2/LICENSE:2107-2497,2915-3071
/code/branches/png2/LICENSE:7262-7263
/code/branches/portals/LICENSE:8087-8455
/code/branches/portals2/LICENSE:8460-8602
/code/branches/ppspickups1/LICENSE:6552-6708
/code/branches/ppspickups2/LICENSE:6527-6532,6554-6709
/code/branches/ppspickups3/LICENSE:6757-6997
/code/branches/ppspickups4/LICENSE:7003-7089
/code/branches/presentation/LICENSE:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/LICENSE:6106-6416,7787-7800
/code/branches/presentation2011/LICENSE:8974-9015
/code/branches/presentation3/LICENSE:6913-7162
/code/branches/questsystem/LICENSE:1894-2088
/code/branches/questsystem2/LICENSE:2107-2259
/code/branches/questsystem5/LICENSE:2776-2905
/code/branches/releasetodo/LICENSE:7614-7647
/code/branches/resource/LICENSE:3327-3366
/code/branches/resource2/LICENSE:3372-5694
/code/branches/rocket/LICENSE:6523-6950
/code/branches/rocket2/LICENSE:6953-6970
/code/branches/script_trigger/LICENSE:1295-1953,1955
/code/branches/shipSelection/LICENSE:9038-9206
/code/branches/skybox2/LICENSE:6559-6989
/code/branches/sound/LICENSE:2829-3010
/code/branches/sound2012/LICENSE:9205-9240
/code/branches/sound3/LICENSE:5941-6102
/code/branches/spaceboundaries/LICENSE:8085-8457
/code/branches/spaceboundaries2/LICENSE:8460-8613
/code/branches/spacegate/LICENSE:9030-9215
/code/branches/spacerace/LICENSE:8182-8630
/code/branches/spaceraceTwo/LICENSE:8881-8996
/code/branches/steering/LICENSE:5949-6091,8140-8595
/code/branches/surfaceRace/LICENSE:9028-9199
/code/branches/tetris/LICENSE:8100-8563
/code/branches/tutoriallevel/LICENSE:7827-8370
/code/branches/tutoriallevel2/LICENSE:8370-8452
/code/branches/tutoriallevel3/LICENSE:8453-8636
/code/branches/unity_build/LICENSE:8440-8716
/code/branches/usability/LICENSE:7915-8078
/code/branches/weapon/LICENSE:1925-2094
/code/branches/weapon2/LICENSE:2107-2488
/code/branches/weapons/LICENSE:2897-3051,8143-8591
/code/branches/weaponsystem/LICENSE:2742-2890
/code/trunk/LICENSE:9189-9204
Property changes on: code/branches/presentation2012/README
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/README:6592-7033
/code/branches/ai2/README:8721-8880
/code/branches/bigships/README:8137-8588
/code/branches/buildsystem/README:1874-2276,2278-2400
/code/branches/buildsystem2/README:2506-2658
/code/branches/buildsystem3/README:2662-2708
/code/branches/ceguilua/README:1802-1808
/code/branches/chat/README:6527-6797
/code/branches/chat2/README:6836-6910
/code/branches/console/README:5941-6104
/code/branches/consolecommands2/README:6451-7178
/code/branches/consolecommands3/README:7178-7283
/code/branches/core3/README:1572-1739
/code/branches/core4/README: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/README:5768-5928,6009
/code/branches/data_cleanup/README:7537-7686
/code/branches/doc/README:7290-7400
/code/branches/dockingsystem/README:8101-8192
/code/branches/dockingsystem2/README:8196-8560
/code/branches/dynamicmatch/README:6584-7030
/code/branches/environment3/README:8887-8975
/code/branches/formation/README:8885-8991
/code/branches/fps/README:6591-7072
/code/branches/gamecontent/README:8893-8968
/code/branches/gameimmersion/README:8102-8577
/code/branches/gamestate/README:6430-6572,6621-6661
/code/branches/gamestates2/README:6594-6745
/code/branches/gametypes/README:2826-3031
/code/branches/gcc43/README:1580
/code/branches/gui/README:1635-1723,2795-2894
/code/branches/hud/README:8883-8986
/code/branches/hudelements/README:6584-6941
/code/branches/hudimprovements/README:7920-8672
/code/branches/ingamemenu/README:6000-6023
/code/branches/input/README:1629-1636
/code/branches/ipv6/README:7293-7458
/code/branches/kicklib/README:7940-8096,8098-8277
/code/branches/kicklib2/README:8282-8350
/code/branches/lastmanstanding/README:7479-7644
/code/branches/lastmanstanding3/README:7903-8175
/code/branches/libraries/README:5612-5692
/code/branches/libraries2/README:5703-5737
/code/branches/lod/README:6586-6911
/code/branches/lodfinal/README:2372-2411
/code/branches/mac_osx/README:7789-8128,8135
/code/branches/map/README:2801-3086,3089
/code/branches/masterserver/README:7502-7738
/code/branches/masterserverfix/README:8933-8936
/code/branches/menu/README:5941-6146,6148,7536-7687
/code/branches/menue/README:8884-8976
/code/branches/miniprojects/README:2754-2824
/code/branches/netp2/README:2835-2988
/code/branches/netp3/README:2988-3082
/code/branches/netp6/README:3214-3302
/code/branches/network/README:2356
/code/branches/network2/README:6434-6465
/code/branches/network3/README:7196-7344
/code/branches/network4/README:7497-7755
/code/branches/network5/README:7757-7781
/code/branches/network6/README:7823-8315
/code/branches/network64/README:2210-2355
/code/branches/newlevel2012/README:9033-9240
/code/branches/notifications/README:7314-7401
/code/branches/objecthierarchy/README:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/README:2171-2479
/code/branches/ois_update/README:7506-7788
/code/branches/output/README:8739-8857
/code/branches/overlay/README:2117-2385
/code/branches/particles/README:2829-3085
/code/branches/particles2/README:6050-6106,6109
/code/branches/pch/README:3113-3194
/code/branches/physics/README:1912-2055,2107-2439
/code/branches/physics_merge/README:2436-2457
/code/branches/pickup/README:8145-8555
/code/branches/pickup2/README:5942-6405
/code/branches/pickup2012/README:9029-9189
/code/branches/pickup3/README:6418-6523
/code/branches/pickup4/README:6594-6710
/code/branches/pickups/README:1926-2086,2127,2827-2915
/code/branches/pickups2/README:2107-2497,2915-3071
/code/branches/png2/README:7262-7263
/code/branches/portals/README:8087-8455
/code/branches/portals2/README:8460-8602
/code/branches/ppspickups1/README:6552-6708
/code/branches/ppspickups2/README:6527-6532,6554-6709
/code/branches/ppspickups3/README:6757-6997
/code/branches/ppspickups4/README:7003-7089
/code/branches/presentation/README:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/README:6106-6416,7787-7800
/code/branches/presentation2011/README:8974-9015
/code/branches/presentation3/README:6913-7162
/code/branches/questsystem/README:1894-2088
/code/branches/questsystem2/README:2107-2259
/code/branches/questsystem5/README:2776-2905
/code/branches/releasetodo/README:7614-7647
/code/branches/resource/README:3327-3366
/code/branches/resource2/README:3372-5694
/code/branches/rocket/README:6523-6950
/code/branches/rocket2/README:6953-6970
/code/branches/script_trigger/README:1295-1953,1955
/code/branches/shipSelection/README:9038-9206
/code/branches/skybox2/README:6559-6989
/code/branches/sound/README:2829-3010
/code/branches/sound2012/README:9205-9240
/code/branches/sound3/README:5941-6102
/code/branches/spaceboundaries/README:8085-8457
/code/branches/spaceboundaries2/README:8460-8613
/code/branches/spacegate/README:9030-9215
/code/branches/spacerace/README:8182-8630
/code/branches/spaceraceTwo/README:8881-8996
/code/branches/steering/README:5949-6091,8140-8595
/code/branches/surfaceRace/README:9028-9199
/code/branches/tetris/README:8100-8563
/code/branches/tutoriallevel/README:7827-8370
/code/branches/tutoriallevel2/README:8370-8452
/code/branches/tutoriallevel3/README:8453-8636
/code/branches/unity_build/README:8440-8716
/code/branches/usability/README:7915-8078
/code/branches/weapon/README:1925-2094
/code/branches/weapon2/README:2107-2488
/code/branches/weapons/README:2897-3051,8143-8591
/code/branches/weaponsystem/README:2742-2890
/code/trunk/README:9189-9204
Property changes on: code/branches/presentation2012/bin
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/bin:6592-7033
/code/branches/ai2/bin:8721-8880
/code/branches/bigships/bin:8137-8588
/code/branches/buildsystem/bin:1874-2276,2278-2400
/code/branches/buildsystem2/bin:2506-2658
/code/branches/buildsystem3/bin:2662-2708
/code/branches/ceguilua/bin:1802-1808
/code/branches/chat/bin:6527-6797
/code/branches/chat2/bin:6836-6910
/code/branches/console/bin:5941-6104
/code/branches/consolecommands2/bin:6451-7178
/code/branches/consolecommands3/bin:7178-7283
/code/branches/core3/bin:1572-1739
/code/branches/core4/bin: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/bin:5768-5928,6009
/code/branches/data_cleanup/bin:7537-7686
/code/branches/doc/bin:7290-7400
/code/branches/dockingsystem/bin:8101-8192
/code/branches/dockingsystem2/bin:8196-8560
/code/branches/dynamicmatch/bin:6584-7030
/code/branches/environment3/bin:8887-8975
/code/branches/formation/bin:8885-8991
/code/branches/fps/bin:6591-7072
/code/branches/gamecontent/bin:8893-8968
/code/branches/gameimmersion/bin:8102-8577
/code/branches/gamestate/bin:6430-6572,6621-6661
/code/branches/gamestates2/bin:6594-6745
/code/branches/gametypes/bin:2826-3031
/code/branches/gcc43/bin:1580
/code/branches/gui/bin:1635-1723,2795-2894
/code/branches/hud/bin:8883-8986
/code/branches/hudelements/bin:6584-6941
/code/branches/hudimprovements/bin:7920-8672
/code/branches/ingamemenu/bin:6000-6023
/code/branches/input/bin:1629-1636
/code/branches/ipv6/bin:7293-7458
/code/branches/kicklib/bin:7940-8096,8098-8277
/code/branches/kicklib2/bin:8282-8350
/code/branches/lastmanstanding/bin:7479-7644
/code/branches/lastmanstanding3/bin:7903-8175
/code/branches/libraries/bin:5612-5692
/code/branches/libraries2/bin:5703-5737
/code/branches/lod/bin:6586-6911
/code/branches/lodfinal/bin:2372-2411
/code/branches/mac_osx/bin:7789-8128,8135
/code/branches/map/bin:2801-3086,3089
/code/branches/masterserver/bin:7502-7738
/code/branches/masterserverfix/bin:8933-8936
/code/branches/menu/bin:5941-6146,6148,7536-7687
/code/branches/menue/bin:8884-8976
/code/branches/miniprojects/bin:2754-2824
/code/branches/netp2/bin:2835-2988
/code/branches/netp3/bin:2988-3082
/code/branches/netp6/bin:3214-3302
/code/branches/network/bin:2356
/code/branches/network2/bin:6434-6465
/code/branches/network3/bin:7196-7344
/code/branches/network4/bin:7497-7755
/code/branches/network5/bin:7757-7781
/code/branches/network6/bin:7823-8315
/code/branches/network64/bin:2210-2355
/code/branches/newlevel2012/bin:9033-9240
/code/branches/notifications/bin:7314-7401
/code/branches/objecthierarchy/bin:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/bin:2171-2479
/code/branches/ois_update/bin:7506-7788
/code/branches/output/bin:8739-8857
/code/branches/overlay/bin:2117-2385
/code/branches/particles/bin:2829-3085
/code/branches/particles2/bin:6050-6106,6109
/code/branches/pch/bin:3113-3194
/code/branches/physics/bin:1912-2055,2107-2439
/code/branches/physics_merge/bin:2436-2457
/code/branches/pickup/bin:8145-8555
/code/branches/pickup2/bin:5942-6405
/code/branches/pickup2012/bin:9029-9189
/code/branches/pickup3/bin:6418-6523
/code/branches/pickup4/bin:6594-6710
/code/branches/pickups/bin:1926-2086,2127,2827-2915
/code/branches/pickups2/bin:2107-2497,2915-3071
/code/branches/png2/bin:7262-7263
/code/branches/portals/bin:8087-8455
/code/branches/portals2/bin:8460-8602
/code/branches/ppspickups1/bin:6552-6708
/code/branches/ppspickups2/bin:6527-6532,6554-6709
/code/branches/ppspickups3/bin:6757-6997
/code/branches/ppspickups4/bin:7003-7089
/code/branches/presentation/bin:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/bin:6106-6416,7787-7800
/code/branches/presentation2011/bin:8974-9015
/code/branches/presentation3/bin:6913-7162
/code/branches/questsystem/bin:1894-2088
/code/branches/questsystem2/bin:2107-2259
/code/branches/questsystem5/bin:2776-2905
/code/branches/releasetodo/bin:7614-7647
/code/branches/resource/bin:3327-3366
/code/branches/resource2/bin:3372-5694
/code/branches/rocket/bin:6523-6950
/code/branches/rocket2/bin:6953-6970
/code/branches/script_trigger/bin:1295-1953,1955
/code/branches/shipSelection/bin:9038-9206
/code/branches/skybox2/bin:6559-6989
/code/branches/sound/bin:2829-3010
/code/branches/sound2012/bin:9205-9240
/code/branches/sound3/bin:5941-6102
/code/branches/spaceboundaries/bin:8085-8457
/code/branches/spaceboundaries2/bin:8460-8613
/code/branches/spacegate/bin:9030-9215
/code/branches/spacerace/bin:8182-8630
/code/branches/spaceraceTwo/bin:8881-8996
/code/branches/steering/bin:5949-6091,8140-8595
/code/branches/surfaceRace/bin:9028-9199
/code/branches/tetris/bin:8100-8563
/code/branches/tutoriallevel/bin:7827-8370
/code/branches/tutoriallevel2/bin:8370-8452
/code/branches/tutoriallevel3/bin:8453-8636
/code/branches/unity_build/bin:8440-8716
/code/branches/usability/bin:7915-8078
/code/branches/weapon/bin:1925-2094
/code/branches/weapon2/bin:2107-2488
/code/branches/weapons/bin:2897-3051,8143-8591
/code/branches/weaponsystem/bin:2742-2890
/code/trunk/bin:9189-9204
Property changes on: code/branches/presentation2012/cmake
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/cmake:6592-7033
/code/branches/ai2/cmake:8721-8880
/code/branches/bigships/cmake:8137-8588
/code/branches/buildsystem/cmake:1874-2276,2278-2400
/code/branches/buildsystem2/cmake:2506-2658
/code/branches/buildsystem3/cmake:2662-2708
/code/branches/ceguilua/cmake:1802-1808
/code/branches/chat/cmake:6527-6797
/code/branches/chat2/cmake:6836-6910
/code/branches/console/cmake:5941-6104
/code/branches/consolecommands2/cmake:6451-7178
/code/branches/consolecommands3/cmake:7178-7283
/code/branches/core3/cmake:1572-1739
/code/branches/core4/cmake: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/cmake:5768-5928,6009
/code/branches/data_cleanup/cmake:7537-7686
/code/branches/doc/cmake:7290-7400
/code/branches/dockingsystem/cmake:8101-8192
/code/branches/dockingsystem2/cmake:8196-8560
/code/branches/dynamicmatch/cmake:6584-7030
/code/branches/environment3/cmake:8887-8975
/code/branches/formation/cmake:8885-8991
/code/branches/fps/cmake:6591-7072
/code/branches/gamecontent/cmake:8893-8968
/code/branches/gameimmersion/cmake:8102-8577
/code/branches/gamestate/cmake:6430-6572,6621-6661
/code/branches/gamestates2/cmake:6594-6745
/code/branches/gametypes/cmake:2826-3031
/code/branches/gcc43/cmake:1580
/code/branches/gui/cmake:1635-1723,2795-2894
/code/branches/hud/cmake:8883-8986
/code/branches/hudelements/cmake:6584-6941
/code/branches/hudimprovements/cmake:7920-8672
/code/branches/ingamemenu/cmake:6000-6023
/code/branches/input/cmake:1629-1636
/code/branches/ipv6/cmake:7293-7458
/code/branches/kicklib/cmake:7940-8096,8098-8277
/code/branches/kicklib2/cmake:8282-8350
/code/branches/lastmanstanding/cmake:7479-7644
/code/branches/lastmanstanding3/cmake:7903-8175
/code/branches/libraries/cmake:5612-5692
/code/branches/libraries2/cmake:5703-5737
/code/branches/lod/cmake:6586-6911
/code/branches/lodfinal/cmake:2372-2411
/code/branches/mac_osx/cmake:7789-8128,8135
/code/branches/map/cmake:2801-3086,3089
/code/branches/masterserver/cmake:7502-7738
/code/branches/masterserverfix/cmake:8933-8936
/code/branches/menu/cmake:5941-6146,6148,7536-7687
/code/branches/menue/cmake:8884-8976
/code/branches/miniprojects/cmake:2754-2824
/code/branches/netp2/cmake:2835-2988
/code/branches/netp3/cmake:2988-3082
/code/branches/netp6/cmake:3214-3302
/code/branches/network/cmake:2356
/code/branches/network2/cmake:6434-6465
/code/branches/network3/cmake:7196-7344
/code/branches/network4/cmake:7497-7755
/code/branches/network5/cmake:7757-7781
/code/branches/network6/cmake:7823-8315
/code/branches/network64/cmake:2210-2355
/code/branches/newlevel2012/cmake:9033-9240
/code/branches/notifications/cmake:7314-7401
/code/branches/objecthierarchy/cmake:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/cmake:2171-2479
/code/branches/ois_update/cmake:7506-7788
/code/branches/output/cmake:8739-8857
/code/branches/overlay/cmake:2117-2385
/code/branches/particles/cmake:2829-3085
/code/branches/particles2/cmake:6050-6106,6109
/code/branches/pch/cmake:3113-3194
/code/branches/physics/cmake:1912-2055,2107-2439
/code/branches/physics_merge/cmake:2436-2457
/code/branches/pickup/cmake:8145-8555
/code/branches/pickup2/cmake:5942-6405
/code/branches/pickup2012/cmake:9029-9189
/code/branches/pickup3/cmake:6418-6523
/code/branches/pickup4/cmake:6594-6710
/code/branches/pickups/cmake:1926-2086,2127,2827-2915
/code/branches/pickups2/cmake:2107-2497,2915-3071
/code/branches/png2/cmake:7262-7263
/code/branches/portals/cmake:8087-8455
/code/branches/portals2/cmake:8460-8602
/code/branches/ppspickups1/cmake:6552-6708
/code/branches/ppspickups2/cmake:6527-6532,6554-6709
/code/branches/ppspickups3/cmake:6757-6997
/code/branches/ppspickups4/cmake:7003-7089
/code/branches/presentation/cmake:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/cmake:6106-6416,7787-7800
/code/branches/presentation2011/cmake:8974-9015
/code/branches/presentation3/cmake:6913-7162
/code/branches/questsystem/cmake:1894-2088
/code/branches/questsystem2/cmake:2107-2259
/code/branches/questsystem5/cmake:2776-2905
/code/branches/releasetodo/cmake:7614-7647
/code/branches/resource/cmake:3327-3366
/code/branches/resource2/cmake:3372-5694
/code/branches/rocket/cmake:6523-6950
/code/branches/rocket2/cmake:6953-6970
/code/branches/script_trigger/cmake:1295-1953,1955
/code/branches/shipSelection/cmake:9038-9206
/code/branches/skybox2/cmake:6559-6989
/code/branches/sound/cmake:2829-3010
/code/branches/sound2012/cmake:9205-9240
/code/branches/sound3/cmake:5941-6102
/code/branches/spaceboundaries/cmake:8085-8457
/code/branches/spaceboundaries2/cmake:8460-8613
/code/branches/spacegate/cmake:9030-9215
/code/branches/spacerace/cmake:8182-8630
/code/branches/spaceraceTwo/cmake:8881-8996
/code/branches/steering/cmake:5949-6091,8140-8595
/code/branches/surfaceRace/cmake:9028-9199
/code/branches/tetris/cmake:8100-8563
/code/branches/tutoriallevel/cmake:7827-8370
/code/branches/tutoriallevel2/cmake:8370-8452
/code/branches/tutoriallevel3/cmake:8453-8636
/code/branches/unity_build/cmake:8440-8716
/code/branches/usability/cmake:7915-8078
/code/branches/weapon/cmake:1925-2094
/code/branches/weapon2/cmake:2107-2488
/code/branches/weapons/cmake:2897-3051,8143-8591
/code/branches/weaponsystem/cmake:2742-2890
/code/trunk/cmake:9189-9204
Property changes on: code/branches/presentation2012/contrib
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/contrib:6592-7033
/code/branches/ai2/contrib:8721-8880
/code/branches/bigships/contrib:8137-8588
/code/branches/buildsystem/contrib:1874-2276,2278-2400
/code/branches/buildsystem2/contrib:2506-2658
/code/branches/buildsystem3/contrib:2662-2708
/code/branches/ceguilua/contrib:1802-1808
/code/branches/chat/contrib:6527-6797
/code/branches/chat2/contrib:6836-6910
/code/branches/console/contrib:5941-6104
/code/branches/consolecommands2/contrib:6451-7178
/code/branches/consolecommands3/contrib:7178-7283
/code/branches/core3/contrib:1572-1739
/code/branches/core4/contrib: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/contrib:5768-5928,6009
/code/branches/data_cleanup/contrib:7537-7686
/code/branches/doc/contrib:7290-7400
/code/branches/dockingsystem/contrib:8101-8192
/code/branches/dockingsystem2/contrib:8196-8560
/code/branches/dynamicmatch/contrib:6584-7030
/code/branches/environment3/contrib:8887-8975
/code/branches/formation/contrib:8885-8991
/code/branches/fps/contrib:6591-7072
/code/branches/gamecontent/contrib:8893-8968
/code/branches/gameimmersion/contrib:8102-8577
/code/branches/gamestate/contrib:6430-6572,6621-6661
/code/branches/gamestates2/contrib:6594-6745
/code/branches/gametypes/contrib:2826-3031
/code/branches/gcc43/contrib:1580
/code/branches/gui/contrib:1635-1723,2795-2894
/code/branches/hud/contrib:8883-8986
/code/branches/hudelements/contrib:6584-6941
/code/branches/hudimprovements/contrib:7920-8672
/code/branches/ingamemenu/contrib:6000-6023
/code/branches/input/contrib:1629-1636
/code/branches/ipv6/contrib:7293-7458
/code/branches/kicklib/contrib:7940-8096,8098-8277
/code/branches/kicklib2/contrib:8282-8350
/code/branches/lastmanstanding/contrib:7479-7644
/code/branches/lastmanstanding3/contrib:7903-8175
/code/branches/libraries/contrib:5612-5692
/code/branches/libraries2/contrib:5703-5737
/code/branches/lod/contrib:6586-6911
/code/branches/lodfinal/contrib:2372-2411
/code/branches/mac_osx/contrib:7789-8128,8135
/code/branches/map/contrib:2801-3086,3089
/code/branches/masterserver/contrib:7502-7738
/code/branches/masterserverfix/contrib:8933-8936
/code/branches/menu/contrib:5941-6146,6148,7536-7687
/code/branches/menue/contrib:8884-8976
/code/branches/miniprojects/contrib:2754-2824
/code/branches/netp2/contrib:2835-2988
/code/branches/netp3/contrib:2988-3082
/code/branches/netp6/contrib:3214-3302
/code/branches/network/contrib:2356
/code/branches/network2/contrib:6434-6465
/code/branches/network3/contrib:7196-7344
/code/branches/network4/contrib:7497-7755
/code/branches/network5/contrib:7757-7781
/code/branches/network6/contrib:7823-8315
/code/branches/network64/contrib:2210-2355
/code/branches/newlevel2012/contrib:9033-9240
/code/branches/notifications/contrib:7314-7401
/code/branches/objecthierarchy/contrib:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/contrib:2171-2479
/code/branches/ois_update/contrib:7506-7788
/code/branches/output/contrib:8739-8857
/code/branches/overlay/contrib:2117-2385
/code/branches/particles/contrib:2829-3085
/code/branches/particles2/contrib:6050-6106,6109
/code/branches/pch/contrib:3113-3194
/code/branches/physics/contrib:1912-2055,2107-2439
/code/branches/physics_merge/contrib:2436-2457
/code/branches/pickup/contrib:8145-8555
/code/branches/pickup2/contrib:5942-6405
/code/branches/pickup2012/contrib:9029-9189
/code/branches/pickup3/contrib:6418-6523
/code/branches/pickup4/contrib:6594-6710
/code/branches/pickups/contrib:1926-2086,2127,2827-2915
/code/branches/pickups2/contrib:2107-2497,2915-3071
/code/branches/png2/contrib:7262-7263
/code/branches/portals/contrib:8087-8455
/code/branches/portals2/contrib:8460-8602
/code/branches/ppspickups1/contrib:6552-6708
/code/branches/ppspickups2/contrib:6527-6532,6554-6709
/code/branches/ppspickups3/contrib:6757-6997
/code/branches/ppspickups4/contrib:7003-7089
/code/branches/presentation/contrib:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/contrib:6106-6416,7787-7800
/code/branches/presentation2011/contrib:8974-9015
/code/branches/presentation3/contrib:6913-7162
/code/branches/questsystem/contrib:1894-2088
/code/branches/questsystem2/contrib:2107-2259
/code/branches/questsystem5/contrib:2776-2905
/code/branches/releasetodo/contrib:7614-7647
/code/branches/resource/contrib:3327-3366
/code/branches/resource2/contrib:3372-5694
/code/branches/rocket/contrib:6523-6950
/code/branches/rocket2/contrib:6953-6970
/code/branches/script_trigger/contrib:1295-1953,1955
/code/branches/shipSelection/contrib:9038-9206
/code/branches/skybox2/contrib:6559-6989
/code/branches/sound/contrib:2829-3010
/code/branches/sound2012/contrib:9205-9240
/code/branches/sound3/contrib:5941-6102
/code/branches/spaceboundaries/contrib:8085-8457
/code/branches/spaceboundaries2/contrib:8460-8613
/code/branches/spacegate/contrib:9030-9215
/code/branches/spacerace/contrib:8182-8630
/code/branches/spaceraceTwo/contrib:8881-8996
/code/branches/steering/contrib:5949-6091,8140-8595
/code/branches/surfaceRace/contrib:9028-9199
/code/branches/tetris/contrib:8100-8563
/code/branches/tutoriallevel/contrib:7827-8370
/code/branches/tutoriallevel2/contrib:8370-8452
/code/branches/tutoriallevel3/contrib:8453-8636
/code/branches/unity_build/contrib:8440-8716
/code/branches/usability/contrib:7915-8078
/code/branches/weapon/contrib:1925-2094
/code/branches/weapon2/contrib:2107-2488
/code/branches/weapons/contrib:2897-3051,8143-8591
/code/branches/weaponsystem/contrib:2742-2890
/code/trunk/contrib:9189-9204
Property changes on: code/branches/presentation2012/data
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data:8196-8560
/code/branches/dynamicmatch/data:6584-7030
/code/branches/environment3/data:8887-8975
/code/branches/formation/data:8885-8991
/code/branches/fps/data:6591-7072
/code/branches/gamecontent/data:8893-8968
/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/hud/data:8883-8986
/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/masterserverfix/data:8933-8936
/code/branches/menu/data:5941-6146,6148,7536-7687
/code/branches/menue/data:8884-8976
/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/newlevel2012/data:9033-9240
/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/output/data:8739-8857
/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/pickup2012/data:9029-9189
/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/presentation/data:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data:6106-6416,7787-7800
/code/branches/presentation2011/data:8974-9015
/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/shipSelection/data:9038-9206
/code/branches/skybox2/data:6559-6989
/code/branches/sound/data:2829-3010
/code/branches/sound2012/data:9205-9240
/code/branches/sound3/data:5941-6102
/code/branches/spaceboundaries/data:8085-8457
/code/branches/spaceboundaries2/data:8460-8613
/code/branches/spacegate/data:9030-9215
/code/branches/spacerace/data:8182-8630
/code/branches/spaceraceTwo/data:8881-8996
/code/branches/steering/data:5949-6091,8140-8595
/code/branches/surfaceRace/data:9028-9199
/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/usability/data:7915-8078
/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/trunk/data:9189-9204
Property changes on: code/branches/presentation2012/data/levels
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels:8196-8560
/code/branches/dynamicmatch/data/levels:6584-7030
/code/branches/environment3/data/levels:8887-8975
/code/branches/formation/data/levels:8885-8991
/code/branches/fps/data/levels:6591-7072
/code/branches/gamecontent/data/levels:8893-8968
/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/hud/data/levels:8883-8986
/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/masterserverfix/data/levels:8933-8936
/code/branches/menu/data/levels:5941-6146,6148,7536-7687
/code/branches/menue/data/levels:8884-8976
/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/newlevel2012/data/levels:9033-9240
/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/output/data/levels:8739-8857
/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/pickup2012/data/levels:9029-9189
/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/presentation/data/levels:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels:6106-6416,7787-7800
/code/branches/presentation2011/data/levels:8974-9015
/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/shipSelection/data/levels:9038-9206
/code/branches/skybox2/data/levels:6559-6989
/code/branches/sound/data/levels:2829-3010
/code/branches/sound2012/data/levels:9205-9214,9215-9240*
/code/branches/sound3/data/levels:5941-6102
/code/branches/spaceboundaries/data/levels:8085-8457
/code/branches/spaceboundaries2/data/levels:8460-8613
/code/branches/spacegate/data/levels:9030-9215
/code/branches/spacerace/data/levels:8182-8630
/code/branches/spaceraceTwo/data/levels:8881-8996
/code/branches/steering/data/levels:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels:9028-9199
/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/usability/data/levels:7915-8078
/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/trunk/data/levels:9189-9204
Property changes on: code/branches/presentation2012/data/levels/FPSTest.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/FPSTest.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/FPSTest.oxw:6584-7030
/code/branches/environment3/data/levels/FPSTest.oxw:8887-8975
/code/branches/formation/data/levels/FPSTest.oxw:8885-8991
/code/branches/fps/data/levels/FPSTest.oxw:6591-7072
/code/branches/gamecontent/data/levels/FPSTest.oxw:8893-8968
/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/hud/data/levels/FPSTest.oxw:8883-8986
/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/masterserverfix/data/levels/FPSTest.oxw:8933-8936
/code/branches/menu/data/levels/FPSTest.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/FPSTest.oxw:8884-8976
/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/newlevel2012/data/levels/FPSTest.oxw:9033-9240
/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/output/data/levels/FPSTest.oxw:8739-8857
/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/pickup2012/data/levels/FPSTest.oxw:9029-9189
/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/presentation/data/levels/FPSTest.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/FPSTest.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/FPSTest.oxw:8974-9015
/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/shipSelection/data/levels/FPSTest.oxw:9038-9206
/code/branches/skybox2/data/levels/FPSTest.oxw:6559-6989
/code/branches/sound/data/levels/FPSTest.oxw:2829-3010
/code/branches/sound2012/data/levels/FPSTest.oxw:9205-9240
/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/spacegate/data/levels/FPSTest.oxw:9030-9215
/code/branches/spacerace/data/levels/FPSTest.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/FPSTest.oxw:8881-8996
/code/branches/steering/data/levels/FPSTest.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/FPSTest.oxw:9028-9199
/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/usability/data/levels/FPSTest.oxw:7915-8078
/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/trunk/data/levels/FPSTest.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/Spacerace2.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/newlevel2012/data/levels/Spacerace2.oxw:9033-9240
/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/pickup2012/data/levels/Spacerace2.oxw:9029-9189
/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/presentation2011/data/levels/Spacerace2.oxw:8974-9015
/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/shipSelection/data/levels/Spacerace2.oxw:9038-9206
/code/branches/skybox2/data/levels/Spacerace2.oxw:6559-6989
/code/branches/sound/data/levels/Spacerace2.oxw:2829-3010
/code/branches/sound2012/data/levels/Spacerace2.oxw:9205-9240
/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/spacegate/data/levels/Spacerace2.oxw:9030-9215
/code/branches/spacerace/data/levels/Spacerace2.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/Spacerace2.oxw:8881-8996
/code/branches/steering/data/levels/Spacerace2.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/Spacerace2.oxw:9028-9199
/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/trunk/data/levels/Spacerace2.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/asteroidField.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/asteroidField.oxw:8887-8975
/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/newlevel2012/data/levels/asteroidField.oxw:9033-9240
/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/pickup2012/data/levels/asteroidField.oxw:9029-9189
/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/presentation2011/data/levels/asteroidField.oxw:8974-9015
/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/shipSelection/data/levels/asteroidField.oxw:9038-9206
/code/branches/skybox2/data/levels/asteroidField.oxw:6559-6989
/code/branches/sound/data/levels/asteroidField.oxw:2829-3010
/code/branches/sound2012/data/levels/asteroidField.oxw:9205-9240
/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/spacegate/data/levels/asteroidField.oxw:9030-9215
/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/surfaceRace/data/levels/asteroidField.oxw:9028-9199
/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/trunk/data/levels/asteroidField.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/asteroids.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/asteroids.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/asteroids.oxw:6584-7030
/code/branches/environment3/data/levels/asteroids.oxw:8887-8975
/code/branches/formation/data/levels/asteroids.oxw:8885-8991
/code/branches/fps/data/levels/asteroids.oxw:6591-7072
/code/branches/gamecontent/data/levels/asteroids.oxw:8893-8968
/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/hud/data/levels/asteroids.oxw:8883-8986
/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/masterserverfix/data/levels/asteroids.oxw:8933-8936
/code/branches/menu/data/levels/asteroids.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/asteroids.oxw:8884-8976
/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/newlevel2012/data/levels/asteroids.oxw:9033-9240
/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/output/data/levels/asteroids.oxw:8739-8857
/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/pickup2012/data/levels/asteroids.oxw:9029-9189
/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/presentation/data/levels/asteroids.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/asteroids.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/asteroids.oxw:8974-9015
/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/shipSelection/data/levels/asteroids.oxw:9038-9206
/code/branches/skybox2/data/levels/asteroids.oxw:6559-6989
/code/branches/sound/data/levels/asteroids.oxw:2829-3010
/code/branches/sound2012/data/levels/asteroids.oxw:9205-9240
/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/spacegate/data/levels/asteroids.oxw:9030-9215
/code/branches/spacerace/data/levels/asteroids.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/asteroids.oxw:8881-8996
/code/branches/steering/data/levels/asteroids.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/asteroids.oxw:9028-9199
/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/usability/data/levels/asteroids.oxw:7915-8078
/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/trunk/data/levels/asteroids.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/docking.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/docking.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/docking.oxw:6584-7030
/code/branches/environment3/data/levels/docking.oxw:8887-8975
/code/branches/formation/data/levels/docking.oxw:8885-8991
/code/branches/fps/data/levels/docking.oxw:6591-7072
/code/branches/gamecontent/data/levels/docking.oxw:8893-8968
/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/hud/data/levels/docking.oxw:8883-8986
/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/masterserverfix/data/levels/docking.oxw:8933-8936
/code/branches/menu/data/levels/docking.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/docking.oxw:8884-8976
/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/newlevel2012/data/levels/docking.oxw:9033-9240
/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/output/data/levels/docking.oxw:8739-8857
/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/pickup2012/data/levels/docking.oxw:9029-9189
/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/presentation/data/levels/docking.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/docking.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/docking.oxw:8974-9015
/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/shipSelection/data/levels/docking.oxw:9038-9206
/code/branches/skybox2/data/levels/docking.oxw:6559-6989
/code/branches/sound/data/levels/docking.oxw:2829-3010
/code/branches/sound2012/data/levels/docking.oxw:9205-9240
/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/spacegate/data/levels/docking.oxw:9030-9215
/code/branches/spacerace/data/levels/docking.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/docking.oxw:8881-8996
/code/branches/steering/data/levels/docking.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/docking.oxw:9028-9199
/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/trunk/data/levels/docking.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/dynamicMatch.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/dynamicMatch.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/dynamicMatch.oxw:6584-7030
/code/branches/environment3/data/levels/dynamicMatch.oxw:8887-8975
/code/branches/formation/data/levels/dynamicMatch.oxw:8885-8991
/code/branches/fps/data/levels/dynamicMatch.oxw:6591-7072
/code/branches/gamecontent/data/levels/dynamicMatch.oxw:8893-8968
/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/hud/data/levels/dynamicMatch.oxw:8883-8986
/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/masterserverfix/data/levels/dynamicMatch.oxw:8933-8936
/code/branches/menu/data/levels/dynamicMatch.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/dynamicMatch.oxw:8884-8976
/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/newlevel2012/data/levels/dynamicMatch.oxw:9033-9240
/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/output/data/levels/dynamicMatch.oxw:8739-8857
/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/pickup2012/data/levels/dynamicMatch.oxw:9029-9189
/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/presentation/data/levels/dynamicMatch.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/dynamicMatch.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/dynamicMatch.oxw:8974-9015
/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/shipSelection/data/levels/dynamicMatch.oxw:9038-9206
/code/branches/skybox2/data/levels/dynamicMatch.oxw:6559-6989
/code/branches/sound/data/levels/dynamicMatch.oxw:2829-3010
/code/branches/sound2012/data/levels/dynamicMatch.oxw:9205-9240
/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/spacegate/data/levels/dynamicMatch.oxw:9030-9215
/code/branches/spacerace/data/levels/dynamicMatch.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/dynamicMatch.oxw:8881-8996
/code/branches/steering/data/levels/dynamicMatch.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/dynamicMatch.oxw:9028-9199
/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/usability/data/levels/dynamicMatch.oxw:7915-8078
/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/trunk/data/levels/dynamicMatch.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/earth.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/earth.oxw:8887-8975
/code/branches/formation/data/levels/earth.oxw:8885-8991
/code/branches/fps/data/levels/earth.oxw:6591-7072
/code/branches/gamecontent/data/levels/earth.oxw:8893-8968
/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/hud/data/levels/earth.oxw:8883-8986
/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/masterserverfix/data/levels/earth.oxw:8933-8936
/code/branches/menu/data/levels/earth.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/earth.oxw:8884-8976
/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/newlevel2012/data/levels/earth.oxw:9033-9240
/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/output/data/levels/earth.oxw:8739-8857
/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/pickup2012/data/levels/earth.oxw:9029-9189
/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/presentation/data/levels/earth.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/earth.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/earth.oxw:8974-9015
/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/shipSelection/data/levels/earth.oxw:9038-9206
/code/branches/skybox2/data/levels/earth.oxw:6559-6989
/code/branches/sound/data/levels/earth.oxw:2829-3010
/code/branches/sound2012/data/levels/earth.oxw:9205-9240
/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/spacegate/data/levels/earth.oxw:9030-9215
/code/branches/spacerace/data/levels/earth.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/earth.oxw:8881-8996
/code/branches/steering/data/levels/earth.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/earth.oxw:9028-9199
/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/trunk/data/levels/earth.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/emptyLevel.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/emptyLevel.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/emptyLevel.oxw:6584-7030
/code/branches/environment3/data/levels/emptyLevel.oxw:8887-8975
/code/branches/formation/data/levels/emptyLevel.oxw:8885-8991
/code/branches/fps/data/levels/emptyLevel.oxw:6591-7072
/code/branches/gamecontent/data/levels/emptyLevel.oxw:8893-8968
/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/hud/data/levels/emptyLevel.oxw:8883-8986
/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/masterserverfix/data/levels/emptyLevel.oxw:8933-8936
/code/branches/menu/data/levels/emptyLevel.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/emptyLevel.oxw:8884-8976
/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/newlevel2012/data/levels/emptyLevel.oxw:9033-9240
/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/output/data/levels/emptyLevel.oxw:8739-8857
/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/pickup2012/data/levels/emptyLevel.oxw:9029-9189
/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/presentation/data/levels/emptyLevel.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/emptyLevel.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/emptyLevel.oxw:8974-9015
/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/shipSelection/data/levels/emptyLevel.oxw:9038-9206
/code/branches/skybox2/data/levels/emptyLevel.oxw:6559-6989
/code/branches/sound/data/levels/emptyLevel.oxw:2829-3010
/code/branches/sound2012/data/levels/emptyLevel.oxw:9205-9240
/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/spacegate/data/levels/emptyLevel.oxw:9030-9215
/code/branches/spacerace/data/levels/emptyLevel.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/emptyLevel.oxw:8881-8996
/code/branches/steering/data/levels/emptyLevel.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/emptyLevel.oxw:9028-9199
/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/usability/data/levels/emptyLevel.oxw:7915-8078
/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
/code/trunk/data/levels/emptyLevel.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/events.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/events.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/events.oxw:6584-7030
/code/branches/environment3/data/levels/events.oxw:8887-8975
/code/branches/formation/data/levels/events.oxw:8885-8991
/code/branches/fps/data/levels/events.oxw:6591-7072
/code/branches/gamecontent/data/levels/events.oxw:8893-8968
/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/hud/data/levels/events.oxw:8883-8986
/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/masterserverfix/data/levels/events.oxw:8933-8936
/code/branches/menu/data/levels/events.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/events.oxw:8884-8976
/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/newlevel2012/data/levels/events.oxw:9033-9240
/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/output/data/levels/events.oxw:8739-8857
/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/pickup2012/data/levels/events.oxw:9029-9189
/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/presentation/data/levels/events.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/events.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/events.oxw:8974-9015
/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/shipSelection/data/levels/events.oxw:9038-9206
/code/branches/skybox2/data/levels/events.oxw:6559-6989
/code/branches/sound/data/levels/events.oxw:2829-3010
/code/branches/sound2012/data/levels/events.oxw:9205-9240
/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/spacegate/data/levels/events.oxw:9030-9215
/code/branches/spacerace/data/levels/events.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/events.oxw:8881-8996
/code/branches/steering/data/levels/events.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/events.oxw:9028-9199
/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/usability/data/levels/events.oxw:7915-8078
/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/trunk/data/levels/events.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/fightInOurBack.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/fightInOurBack.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/fightInOurBack.oxw:6584-7030
/code/branches/environment3/data/levels/fightInOurBack.oxw:8887-8975
/code/branches/formation/data/levels/fightInOurBack.oxw:8885-8991
/code/branches/fps/data/levels/fightInOurBack.oxw:6591-7072
/code/branches/gamecontent/data/levels/fightInOurBack.oxw:8893-8968
/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/hud/data/levels/fightInOurBack.oxw:8883-8986
/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/masterserverfix/data/levels/fightInOurBack.oxw:8933-8936
/code/branches/menu/data/levels/fightInOurBack.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/fightInOurBack.oxw:8884-8976
/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/newlevel2012/data/levels/fightInOurBack.oxw:9033-9240
/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/output/data/levels/fightInOurBack.oxw:8739-8857
/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/pickup2012/data/levels/fightInOurBack.oxw:9029-9189
/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/presentation/data/levels/fightInOurBack.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/fightInOurBack.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/fightInOurBack.oxw:8974-9015
/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/shipSelection/data/levels/fightInOurBack.oxw:9038-9206
/code/branches/skybox2/data/levels/fightInOurBack.oxw:6559-6989
/code/branches/sound/data/levels/fightInOurBack.oxw:2829-3010
/code/branches/sound2012/data/levels/fightInOurBack.oxw:9205-9240
/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/spacegate/data/levels/fightInOurBack.oxw:9030-9215
/code/branches/spacerace/data/levels/fightInOurBack.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/fightInOurBack.oxw:8881-8996
/code/branches/steering/data/levels/fightInOurBack.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/fightInOurBack.oxw:9028-9199
/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/usability/data/levels/fightInOurBack.oxw:7915-8078
/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/trunk/data/levels/fightInOurBack.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/includes:8196-8560
/code/branches/dynamicmatch/data/levels/includes:6584-7030
/code/branches/environment3/data/levels/includes:8887-8975
/code/branches/formation/data/levels/includes:8885-8991
/code/branches/fps/data/levels/includes:6591-7072
/code/branches/gamecontent/data/levels/includes:8893-8968
/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/hud/data/levels/includes:8883-8986
/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/masterserverfix/data/levels/includes:8933-8936
/code/branches/menu/data/levels/includes:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes:8884-8976
/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/newlevel2012/data/levels/includes:9033-9240
/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/output/data/levels/includes:8739-8857
/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/pickup2012/data/levels/includes:9029-9189
/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/presentation/data/levels/includes:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes:8974-9015
/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/shipSelection/data/levels/includes:9038-9206
/code/branches/skybox2/data/levels/includes:6559-6989
/code/branches/sound/data/levels/includes:2829-3010
/code/branches/sound2012/data/levels/includes:9205-9214,9215-9240*
/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/spacegate/data/levels/includes:9030-9215
/code/branches/spacerace/data/levels/includes:8182-8630
/code/branches/spaceraceTwo/data/levels/includes:8881-8996
/code/branches/steering/data/levels/includes:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes:9028-9199
/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/usability/data/levels/includes:7915-8078
/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/trunk/data/levels/includes:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/CuboidSpaceStation.lua
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/includes/CuboidSpaceStation.lua:8196-8560
/code/branches/dynamicmatch/data/levels/includes/CuboidSpaceStation.lua:6584-7030
/code/branches/environment3/data/levels/includes/CuboidSpaceStation.lua:8887-8975
/code/branches/formation/data/levels/includes/CuboidSpaceStation.lua:8885-8991
/code/branches/fps/data/levels/includes/CuboidSpaceStation.lua:6591-7072
/code/branches/gamecontent/data/levels/includes/CuboidSpaceStation.lua:8893-8968
/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/hud/data/levels/includes/CuboidSpaceStation.lua:8883-8986
/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/masterserverfix/data/levels/includes/CuboidSpaceStation.lua:8933-8936
/code/branches/menu/data/levels/includes/CuboidSpaceStation.lua:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/CuboidSpaceStation.lua:8884-8976
/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/newlevel2012/data/levels/includes/CuboidSpaceStation.lua:9033-9240
/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/output/data/levels/includes/CuboidSpaceStation.lua:8739-8857
/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/pickup2012/data/levels/includes/CuboidSpaceStation.lua:9029-9189
/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/presentation/data/levels/includes/CuboidSpaceStation.lua:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/CuboidSpaceStation.lua:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/CuboidSpaceStation.lua:8974-9015
/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/shipSelection/data/levels/includes/CuboidSpaceStation.lua:9038-9206
/code/branches/skybox2/data/levels/includes/CuboidSpaceStation.lua:6559-6989
/code/branches/sound/data/levels/includes/CuboidSpaceStation.lua:2829-3010
/code/branches/sound2012/data/levels/includes/CuboidSpaceStation.lua:9205-9240
/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/spacegate/data/levels/includes/CuboidSpaceStation.lua:9030-9215
/code/branches/spacerace/data/levels/includes/CuboidSpaceStation.lua:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/CuboidSpaceStation.lua:8881-8996
/code/branches/steering/data/levels/includes/CuboidSpaceStation.lua:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/CuboidSpaceStation.lua:9028-9199
/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/usability/data/levels/includes/CuboidSpaceStation.lua:7915-8078
/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/trunk/data/levels/includes/CuboidSpaceStation.lua:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/asteroidField.lua
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/includes/asteroidField.lua:8887-8975
/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/newlevel2012/data/levels/includes/asteroidField.lua:9033-9240
/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/pickup2012/data/levels/includes/asteroidField.lua:9029-9189
/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/presentation2011/data/levels/includes/asteroidField.lua:8974-9015
/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/shipSelection/data/levels/includes/asteroidField.lua:9038-9206
/code/branches/skybox2/data/levels/includes/asteroidField.lua:6559-6989
/code/branches/sound/data/levels/includes/asteroidField.lua:2829-3010
/code/branches/sound2012/data/levels/includes/asteroidField.lua:9205-9240
/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/spacegate/data/levels/includes/asteroidField.lua:9030-9215
/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/surfaceRace/data/levels/includes/asteroidField.lua:9028-9199
/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/trunk/data/levels/includes/asteroidField.lua:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/notifications.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/includes/notifications.oxi:8887-8975
/code/branches/formation/data/levels/includes/notifications.oxi:8885-8991
/code/branches/fps/data/levels/includes/notifications.oxi:6591-7072
/code/branches/gamecontent/data/levels/includes/notifications.oxi:8893-8968
/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/hud/data/levels/includes/notifications.oxi:8883-8986
/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/masterserverfix/data/levels/includes/notifications.oxi:8933-8936
/code/branches/menu/data/levels/includes/notifications.oxi:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/notifications.oxi:8884-8976
/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/newlevel2012/data/levels/includes/notifications.oxi:9033-9240
/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/output/data/levels/includes/notifications.oxi:8739-8857
/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/pickup2012/data/levels/includes/notifications.oxi:9029-9189
/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/presentation/data/levels/includes/notifications.oxi:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/notifications.oxi:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/notifications.oxi:8974-9015
/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/shipSelection/data/levels/includes/notifications.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/notifications.oxi:6559-6989
/code/branches/sound/data/levels/includes/notifications.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/notifications.oxi:9205-9240
/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/spacegate/data/levels/includes/notifications.oxi:9030-9215
/code/branches/spacerace/data/levels/includes/notifications.oxi:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/notifications.oxi:8881-8996
/code/branches/steering/data/levels/includes/notifications.oxi:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/notifications.oxi:9028-9199
/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/trunk/data/levels/includes/notifications.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/pickups.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/includes/pickups.oxi:8196-8560
/code/branches/dynamicmatch/data/levels/includes/pickups.oxi:6584-7030
/code/branches/environment3/data/levels/includes/pickups.oxi:8887-8975
/code/branches/formation/data/levels/includes/pickups.oxi:8885-8991
/code/branches/fps/data/levels/includes/pickups.oxi:6591-7072
/code/branches/gamecontent/data/levels/includes/pickups.oxi:8893-8968
/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/hud/data/levels/includes/pickups.oxi:8883-8986
/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/masterserverfix/data/levels/includes/pickups.oxi:8933-8936
/code/branches/menu/data/levels/includes/pickups.oxi:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/pickups.oxi:8884-8976
/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/newlevel2012/data/levels/includes/pickups.oxi:9033-9240
/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/output/data/levels/includes/pickups.oxi:8739-8857
/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/pickup2012/data/levels/includes/pickups.oxi:9029-9189
/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/presentation/data/levels/includes/pickups.oxi:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/pickups.oxi:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/pickups.oxi:8974-9015
/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/shipSelection/data/levels/includes/pickups.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/pickups.oxi:6559-6989
/code/branches/sound/data/levels/includes/pickups.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/pickups.oxi:9205-9240
/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/spacegate/data/levels/includes/pickups.oxi:9030-9215
/code/branches/spacerace/data/levels/includes/pickups.oxi:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/pickups.oxi:8881-8996
/code/branches/steering/data/levels/includes/pickups.oxi:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/pickups.oxi:9028-9199
/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/usability/data/levels/includes/pickups.oxi:7915-8078
/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/trunk/data/levels/includes/pickups.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/weaponSettingsAssff.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/includes/weaponSettingsAssff.oxi:8196-8560
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsAssff.oxi:6584-7030
/code/branches/environment3/data/levels/includes/weaponSettingsAssff.oxi:8887-8975
/code/branches/formation/data/levels/includes/weaponSettingsAssff.oxi:8885-8991
/code/branches/fps/data/levels/includes/weaponSettingsAssff.oxi:6591-7072
/code/branches/gamecontent/data/levels/includes/weaponSettingsAssff.oxi:8893-8968
/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/hud/data/levels/includes/weaponSettingsAssff.oxi:8883-8986
/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/masterserverfix/data/levels/includes/weaponSettingsAssff.oxi:8933-8936
/code/branches/menu/data/levels/includes/weaponSettingsAssff.oxi:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/weaponSettingsAssff.oxi:8884-8976
/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/newlevel2012/data/levels/includes/weaponSettingsAssff.oxi:9033-9240
/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/output/data/levels/includes/weaponSettingsAssff.oxi:8739-8857
/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/pickup2012/data/levels/includes/weaponSettingsAssff.oxi:9029-9189
/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/presentation/data/levels/includes/weaponSettingsAssff.oxi:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/weaponSettingsAssff.oxi:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/weaponSettingsAssff.oxi:8974-9015
/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/shipSelection/data/levels/includes/weaponSettingsAssff.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/weaponSettingsAssff.oxi:6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsAssff.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/weaponSettingsAssff.oxi:9205-9240
/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/spacegate/data/levels/includes/weaponSettingsAssff.oxi:9030-9215
/code/branches/spacerace/data/levels/includes/weaponSettingsAssff.oxi:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsAssff.oxi:8881-8996
/code/branches/steering/data/levels/includes/weaponSettingsAssff.oxi:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/weaponSettingsAssff.oxi:9028-9199
/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/usability/data/levels/includes/weaponSettingsAssff.oxi:7915-8078
/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/trunk/data/levels/includes/weaponSettingsAssff.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/weaponSettingsAssff2.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/includes/weaponSettingsAssff2.oxi:8887-8975
/code/branches/formation/data/levels/includes/weaponSettingsAssff2.oxi:8885-8991
/code/branches/fps/data/levels/includes/weaponSettingsAssff2.oxi:6591-7072
/code/branches/gamecontent/data/levels/includes/weaponSettingsAssff2.oxi:8893-8968
/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/hud/data/levels/includes/weaponSettingsAssff2.oxi:8883-8986
/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/masterserverfix/data/levels/includes/weaponSettingsAssff2.oxi:8933-8936
/code/branches/menu/data/levels/includes/weaponSettingsAssff2.oxi:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/weaponSettingsAssff2.oxi:8884-8976
/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/newlevel2012/data/levels/includes/weaponSettingsAssff2.oxi:9033-9240
/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/output/data/levels/includes/weaponSettingsAssff2.oxi:8739-8857
/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/pickup2012/data/levels/includes/weaponSettingsAssff2.oxi:9029-9189
/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/presentation/data/levels/includes/weaponSettingsAssff2.oxi:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/weaponSettingsAssff2.oxi:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/weaponSettingsAssff2.oxi:8974-9015
/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/shipSelection/data/levels/includes/weaponSettingsAssff2.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/weaponSettingsAssff2.oxi:6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsAssff2.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/weaponSettingsAssff2.oxi:9205-9240
/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/spacegate/data/levels/includes/weaponSettingsAssff2.oxi:9030-9215
/code/branches/spacerace/data/levels/includes/weaponSettingsAssff2.oxi:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsAssff2.oxi:8881-8996
/code/branches/steering/data/levels/includes/weaponSettingsAssff2.oxi:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/weaponSettingsAssff2.oxi:9028-9199
/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/trunk/data/levels/includes/weaponSettingsAssff2.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/weaponSettingsFPS.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/includes/weaponSettingsFPS.oxi:8196-8560
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsFPS.oxi:6584-7030
/code/branches/environment3/data/levels/includes/weaponSettingsFPS.oxi:8887-8975
/code/branches/formation/data/levels/includes/weaponSettingsFPS.oxi:8885-8991
/code/branches/fps/data/levels/includes/weaponSettingsFPS.oxi:6591-7072
/code/branches/gamecontent/data/levels/includes/weaponSettingsFPS.oxi:8893-8968
/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/hud/data/levels/includes/weaponSettingsFPS.oxi:8883-8986
/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/masterserverfix/data/levels/includes/weaponSettingsFPS.oxi:8933-8936
/code/branches/menu/data/levels/includes/weaponSettingsFPS.oxi:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/weaponSettingsFPS.oxi:8884-8976
/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/newlevel2012/data/levels/includes/weaponSettingsFPS.oxi:9033-9240
/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/output/data/levels/includes/weaponSettingsFPS.oxi:8739-8857
/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/pickup2012/data/levels/includes/weaponSettingsFPS.oxi:9029-9189
/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/presentation/data/levels/includes/weaponSettingsFPS.oxi:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/weaponSettingsFPS.oxi:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/weaponSettingsFPS.oxi:8974-9015
/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/shipSelection/data/levels/includes/weaponSettingsFPS.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/weaponSettingsFPS.oxi:6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsFPS.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/weaponSettingsFPS.oxi:9205-9240
/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/spacegate/data/levels/includes/weaponSettingsFPS.oxi:9030-9215
/code/branches/spacerace/data/levels/includes/weaponSettingsFPS.oxi:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsFPS.oxi:8881-8996
/code/branches/steering/data/levels/includes/weaponSettingsFPS.oxi:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/weaponSettingsFPS.oxi:9028-9199
/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/usability/data/levels/includes/weaponSettingsFPS.oxi:7915-8078
/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/trunk/data/levels/includes/weaponSettingsFPS.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/weaponSettingsGhost.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/includes/weaponSettingsGhost.oxi:8196-8560
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsGhost.oxi:6584-7030
/code/branches/environment3/data/levels/includes/weaponSettingsGhost.oxi:8887-8975
/code/branches/formation/data/levels/includes/weaponSettingsGhost.oxi:8885-8991
/code/branches/fps/data/levels/includes/weaponSettingsGhost.oxi:6591-7072
/code/branches/gamecontent/data/levels/includes/weaponSettingsGhost.oxi:8893-8968
/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/hud/data/levels/includes/weaponSettingsGhost.oxi:8883-8986
/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/masterserverfix/data/levels/includes/weaponSettingsGhost.oxi:8933-8936
/code/branches/menu/data/levels/includes/weaponSettingsGhost.oxi:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/weaponSettingsGhost.oxi:8884-8976
/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/newlevel2012/data/levels/includes/weaponSettingsGhost.oxi:9033-9240
/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/output/data/levels/includes/weaponSettingsGhost.oxi:8739-8857
/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/pickup2012/data/levels/includes/weaponSettingsGhost.oxi:9029-9189
/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/presentation/data/levels/includes/weaponSettingsGhost.oxi:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/weaponSettingsGhost.oxi:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/weaponSettingsGhost.oxi:8974-9015
/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/shipSelection/data/levels/includes/weaponSettingsGhost.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/weaponSettingsGhost.oxi:6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsGhost.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/weaponSettingsGhost.oxi:9205-9240
/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/spacegate/data/levels/includes/weaponSettingsGhost.oxi:9030-9215
/code/branches/spacerace/data/levels/includes/weaponSettingsGhost.oxi:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsGhost.oxi:8881-8996
/code/branches/steering/data/levels/includes/weaponSettingsGhost.oxi:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/weaponSettingsGhost.oxi:9028-9199
/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/usability/data/levels/includes/weaponSettingsGhost.oxi:7915-8078
/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/trunk/data/levels/includes/weaponSettingsGhost.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/weaponSettingsH2.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/includes/weaponSettingsH2.oxi:8196-8560
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsH2.oxi:6584-7030
/code/branches/environment3/data/levels/includes/weaponSettingsH2.oxi:8887-8975
/code/branches/formation/data/levels/includes/weaponSettingsH2.oxi:8885-8991
/code/branches/fps/data/levels/includes/weaponSettingsH2.oxi:6591-7072
/code/branches/gamecontent/data/levels/includes/weaponSettingsH2.oxi:8893-8968
/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/hud/data/levels/includes/weaponSettingsH2.oxi:8883-8986
/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/masterserverfix/data/levels/includes/weaponSettingsH2.oxi:8933-8936
/code/branches/menu/data/levels/includes/weaponSettingsH2.oxi:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/weaponSettingsH2.oxi:8884-8976
/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/newlevel2012/data/levels/includes/weaponSettingsH2.oxi:9033-9240
/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/output/data/levels/includes/weaponSettingsH2.oxi:8739-8857
/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/pickup2012/data/levels/includes/weaponSettingsH2.oxi:9029-9189
/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/presentation/data/levels/includes/weaponSettingsH2.oxi:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/weaponSettingsH2.oxi:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/weaponSettingsH2.oxi:8974-9015
/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/shipSelection/data/levels/includes/weaponSettingsH2.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/weaponSettingsH2.oxi:6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsH2.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/weaponSettingsH2.oxi:9205-9240
/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/spacegate/data/levels/includes/weaponSettingsH2.oxi:9030-9215
/code/branches/spacerace/data/levels/includes/weaponSettingsH2.oxi:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsH2.oxi:8881-8996
/code/branches/steering/data/levels/includes/weaponSettingsH2.oxi:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/weaponSettingsH2.oxi:9028-9199
/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/usability/data/levels/includes/weaponSettingsH2.oxi:7915-8078
/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/trunk/data/levels/includes/weaponSettingsH2.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/weaponSettingsHXY.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/includes/weaponSettingsHXY.oxi:8196-8560
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsHXY.oxi:6584-7030
/code/branches/environment3/data/levels/includes/weaponSettingsHXY.oxi:8887-8975
/code/branches/formation/data/levels/includes/weaponSettingsHXY.oxi:8885-8991
/code/branches/fps/data/levels/includes/weaponSettingsHXY.oxi:6591-7072
/code/branches/gamecontent/data/levels/includes/weaponSettingsHXY.oxi:8893-8968
/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/hud/data/levels/includes/weaponSettingsHXY.oxi:8883-8986
/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/masterserverfix/data/levels/includes/weaponSettingsHXY.oxi:8933-8936
/code/branches/menu/data/levels/includes/weaponSettingsHXY.oxi:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/weaponSettingsHXY.oxi:8884-8976
/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/newlevel2012/data/levels/includes/weaponSettingsHXY.oxi:9033-9240
/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/output/data/levels/includes/weaponSettingsHXY.oxi:8739-8857
/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/pickup2012/data/levels/includes/weaponSettingsHXY.oxi:9029-9189
/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/presentation/data/levels/includes/weaponSettingsHXY.oxi:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/weaponSettingsHXY.oxi:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/weaponSettingsHXY.oxi:8974-9015
/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/shipSelection/data/levels/includes/weaponSettingsHXY.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/weaponSettingsHXY.oxi:6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsHXY.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/weaponSettingsHXY.oxi:9205-9240
/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/spacegate/data/levels/includes/weaponSettingsHXY.oxi:9030-9215
/code/branches/spacerace/data/levels/includes/weaponSettingsHXY.oxi:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsHXY.oxi:8881-8996
/code/branches/steering/data/levels/includes/weaponSettingsHXY.oxi:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/weaponSettingsHXY.oxi:9028-9199
/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/usability/data/levels/includes/weaponSettingsHXY.oxi:7915-8078
/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/trunk/data/levels/includes/weaponSettingsHXY.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/weaponSettingsImmTest.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/includes/weaponSettingsImmTest.oxi:8887-8975
/code/branches/formation/data/levels/includes/weaponSettingsImmTest.oxi:8885-8991
/code/branches/fps/data/levels/includes/weaponSettingsImmTest.oxi:6591-7072
/code/branches/gamecontent/data/levels/includes/weaponSettingsImmTest.oxi:8893-8968
/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/hud/data/levels/includes/weaponSettingsImmTest.oxi:8883-8986
/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/masterserverfix/data/levels/includes/weaponSettingsImmTest.oxi:8933-8936
/code/branches/menu/data/levels/includes/weaponSettingsImmTest.oxi:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/weaponSettingsImmTest.oxi:8884-8976
/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/newlevel2012/data/levels/includes/weaponSettingsImmTest.oxi:9033-9240
/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/output/data/levels/includes/weaponSettingsImmTest.oxi:8739-8857
/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/pickup2012/data/levels/includes/weaponSettingsImmTest.oxi:9029-9189
/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/presentation/data/levels/includes/weaponSettingsImmTest.oxi:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/weaponSettingsImmTest.oxi:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/weaponSettingsImmTest.oxi:8974-9015
/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/shipSelection/data/levels/includes/weaponSettingsImmTest.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/weaponSettingsImmTest.oxi:6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsImmTest.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/weaponSettingsImmTest.oxi:9205-9240
/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/spacegate/data/levels/includes/weaponSettingsImmTest.oxi:9030-9215
/code/branches/spacerace/data/levels/includes/weaponSettingsImmTest.oxi:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsImmTest.oxi:8881-8996
/code/branches/steering/data/levels/includes/weaponSettingsImmTest.oxi:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/weaponSettingsImmTest.oxi:9028-9199
/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/trunk/data/levels/includes/weaponSettingsImmTest.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/weaponSettingsPirate.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/includes/weaponSettingsPirate.oxi:8196-8560
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsPirate.oxi:6584-7030
/code/branches/environment3/data/levels/includes/weaponSettingsPirate.oxi:8887-8975
/code/branches/formation/data/levels/includes/weaponSettingsPirate.oxi:8885-8991
/code/branches/fps/data/levels/includes/weaponSettingsPirate.oxi:6591-7072
/code/branches/gamecontent/data/levels/includes/weaponSettingsPirate.oxi:8893-8968
/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/hud/data/levels/includes/weaponSettingsPirate.oxi:8883-8986
/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/masterserverfix/data/levels/includes/weaponSettingsPirate.oxi:8933-8936
/code/branches/menu/data/levels/includes/weaponSettingsPirate.oxi:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/weaponSettingsPirate.oxi:8884-8976
/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/newlevel2012/data/levels/includes/weaponSettingsPirate.oxi:9033-9240
/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/output/data/levels/includes/weaponSettingsPirate.oxi:8739-8857
/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/pickup2012/data/levels/includes/weaponSettingsPirate.oxi:9029-9189
/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/presentation/data/levels/includes/weaponSettingsPirate.oxi:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/weaponSettingsPirate.oxi:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/weaponSettingsPirate.oxi:8974-9015
/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/shipSelection/data/levels/includes/weaponSettingsPirate.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/weaponSettingsPirate.oxi:6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsPirate.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/weaponSettingsPirate.oxi:9205-9240
/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/spacegate/data/levels/includes/weaponSettingsPirate.oxi:9030-9215
/code/branches/spacerace/data/levels/includes/weaponSettingsPirate.oxi:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsPirate.oxi:8881-8996
/code/branches/steering/data/levels/includes/weaponSettingsPirate.oxi:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/weaponSettingsPirate.oxi:9028-9199
/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/usability/data/levels/includes/weaponSettingsPirate.oxi:7915-8078
/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/trunk/data/levels/includes/weaponSettingsPirate.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/weaponSettingsSpacecruiser.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/gamecontent/data/levels/includes/weaponSettingsSpacecruiser.oxi:8893-8968
/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/masterserverfix/data/levels/includes/weaponSettingsSpacecruiser.oxi:8933-8936
/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/newlevel2012/data/levels/includes/weaponSettingsSpacecruiser.oxi:9033-9240
/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/pickup2012/data/levels/includes/weaponSettingsSpacecruiser.oxi:9029-9189
/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/presentation2011/data/levels/includes/weaponSettingsSpacecruiser.oxi:8974-9015
/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/shipSelection/data/levels/includes/weaponSettingsSpacecruiser.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/weaponSettingsSpacecruiser.oxi:6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsSpacecruiser.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/weaponSettingsSpacecruiser.oxi:9205-9240
/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/spacegate/data/levels/includes/weaponSettingsSpacecruiser.oxi:9030-9215
/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/surfaceRace/data/levels/includes/weaponSettingsSpacecruiser.oxi:9028-9199
/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/trunk/data/levels/includes/weaponSettingsSpacecruiser.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/weaponSettingsSwallow.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/includes/weaponSettingsSwallow.oxi:8196-8560
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsSwallow.oxi:6584-7030
/code/branches/environment3/data/levels/includes/weaponSettingsSwallow.oxi:8887-8975
/code/branches/formation/data/levels/includes/weaponSettingsSwallow.oxi:8885-8991
/code/branches/fps/data/levels/includes/weaponSettingsSwallow.oxi:6591-7072
/code/branches/gamecontent/data/levels/includes/weaponSettingsSwallow.oxi:8893-8968
/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/hud/data/levels/includes/weaponSettingsSwallow.oxi:8883-8986
/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/masterserverfix/data/levels/includes/weaponSettingsSwallow.oxi:8933-8936
/code/branches/menu/data/levels/includes/weaponSettingsSwallow.oxi:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/weaponSettingsSwallow.oxi:8884-8976
/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/newlevel2012/data/levels/includes/weaponSettingsSwallow.oxi:9033-9240
/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/output/data/levels/includes/weaponSettingsSwallow.oxi:8739-8857
/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/pickup2012/data/levels/includes/weaponSettingsSwallow.oxi:9029-9189
/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/presentation/data/levels/includes/weaponSettingsSwallow.oxi:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/weaponSettingsSwallow.oxi:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/weaponSettingsSwallow.oxi:8974-9015
/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/shipSelection/data/levels/includes/weaponSettingsSwallow.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/weaponSettingsSwallow.oxi:6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsSwallow.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/weaponSettingsSwallow.oxi:9205-9240
/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/spacegate/data/levels/includes/weaponSettingsSwallow.oxi:9030-9215
/code/branches/spacerace/data/levels/includes/weaponSettingsSwallow.oxi:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsSwallow.oxi:8881-8996
/code/branches/steering/data/levels/includes/weaponSettingsSwallow.oxi:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/weaponSettingsSwallow.oxi:9028-9199
/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/usability/data/levels/includes/weaponSettingsSwallow.oxi:7915-8078
/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/trunk/data/levels/includes/weaponSettingsSwallow.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/includes/weaponSettingsTransporter.oxi
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/includes/weaponSettingsTransporter.oxi:8196-8560
/code/branches/dynamicmatch/data/levels/includes/weaponSettingsTransporter.oxi:6584-7030
/code/branches/environment3/data/levels/includes/weaponSettingsTransporter.oxi:8887-8975
/code/branches/formation/data/levels/includes/weaponSettingsTransporter.oxi:8885-8991
/code/branches/fps/data/levels/includes/weaponSettingsTransporter.oxi:6591-7072
/code/branches/gamecontent/data/levels/includes/weaponSettingsTransporter.oxi:8893-8968
/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/hud/data/levels/includes/weaponSettingsTransporter.oxi:8883-8986
/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/masterserverfix/data/levels/includes/weaponSettingsTransporter.oxi:8933-8936
/code/branches/menu/data/levels/includes/weaponSettingsTransporter.oxi:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/includes/weaponSettingsTransporter.oxi:8884-8976
/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/newlevel2012/data/levels/includes/weaponSettingsTransporter.oxi:9033-9240
/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/output/data/levels/includes/weaponSettingsTransporter.oxi:8739-8857
/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/pickup2012/data/levels/includes/weaponSettingsTransporter.oxi:9029-9189
/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/presentation/data/levels/includes/weaponSettingsTransporter.oxi:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/includes/weaponSettingsTransporter.oxi:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/includes/weaponSettingsTransporter.oxi:8974-9015
/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/shipSelection/data/levels/includes/weaponSettingsTransporter.oxi:9038-9206
/code/branches/skybox2/data/levels/includes/weaponSettingsTransporter.oxi:6559-6989
/code/branches/sound/data/levels/includes/weaponSettingsTransporter.oxi:2829-3010
/code/branches/sound2012/data/levels/includes/weaponSettingsTransporter.oxi:9205-9240
/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/spacegate/data/levels/includes/weaponSettingsTransporter.oxi:9030-9215
/code/branches/spacerace/data/levels/includes/weaponSettingsTransporter.oxi:8182-8630
/code/branches/spaceraceTwo/data/levels/includes/weaponSettingsTransporter.oxi:8881-8996
/code/branches/steering/data/levels/includes/weaponSettingsTransporter.oxi:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/includes/weaponSettingsTransporter.oxi:9028-9199
/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/usability/data/levels/includes/weaponSettingsTransporter.oxi:7915-8078
/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/trunk/data/levels/includes/weaponSettingsTransporter.oxi:9189-9204
Property changes on: code/branches/presentation2012/data/levels/lastManStanding.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/lastManStanding.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/lastManStanding.oxw:6584-7030
/code/branches/environment3/data/levels/lastManStanding.oxw:8887-8975
/code/branches/formation/data/levels/lastManStanding.oxw:8885-8991
/code/branches/fps/data/levels/lastManStanding.oxw:6591-7072
/code/branches/gamecontent/data/levels/lastManStanding.oxw:8893-8968
/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/hud/data/levels/lastManStanding.oxw:8883-8986
/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/masterserverfix/data/levels/lastManStanding.oxw:8933-8936
/code/branches/menu/data/levels/lastManStanding.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/lastManStanding.oxw:8884-8976
/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/newlevel2012/data/levels/lastManStanding.oxw:9033-9240
/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/output/data/levels/lastManStanding.oxw:8739-8857
/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/pickup2012/data/levels/lastManStanding.oxw:9029-9189
/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/presentation/data/levels/lastManStanding.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/lastManStanding.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/lastManStanding.oxw:8974-9015
/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/shipSelection/data/levels/lastManStanding.oxw:9038-9206
/code/branches/skybox2/data/levels/lastManStanding.oxw:6559-6989
/code/branches/sound/data/levels/lastManStanding.oxw:2829-3010
/code/branches/sound2012/data/levels/lastManStanding.oxw:9205-9240
/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/spacegate/data/levels/lastManStanding.oxw:9030-9215
/code/branches/spacerace/data/levels/lastManStanding.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/lastManStanding.oxw:8881-8996
/code/branches/steering/data/levels/lastManStanding.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/lastManStanding.oxw:9028-9199
/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/usability/data/levels/lastManStanding.oxw:7915-8078
/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/trunk/data/levels/lastManStanding.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/lastTeamStanding.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/lastTeamStanding.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/lastTeamStanding.oxw:6584-7030
/code/branches/environment3/data/levels/lastTeamStanding.oxw:8887-8975
/code/branches/formation/data/levels/lastTeamStanding.oxw:8885-8991
/code/branches/fps/data/levels/lastTeamStanding.oxw:6591-7072
/code/branches/gamecontent/data/levels/lastTeamStanding.oxw:8893-8968
/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/hud/data/levels/lastTeamStanding.oxw:8883-8986
/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/masterserverfix/data/levels/lastTeamStanding.oxw:8933-8936
/code/branches/menu/data/levels/lastTeamStanding.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/lastTeamStanding.oxw:8884-8976
/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/newlevel2012/data/levels/lastTeamStanding.oxw:9033-9240
/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/output/data/levels/lastTeamStanding.oxw:8739-8857
/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/pickup2012/data/levels/lastTeamStanding.oxw:9029-9189
/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/presentation/data/levels/lastTeamStanding.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/lastTeamStanding.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/lastTeamStanding.oxw:8974-9015
/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/shipSelection/data/levels/lastTeamStanding.oxw:9038-9206
/code/branches/skybox2/data/levels/lastTeamStanding.oxw:6559-6989
/code/branches/sound/data/levels/lastTeamStanding.oxw:2829-3010
/code/branches/sound2012/data/levels/lastTeamStanding.oxw:9205-9240
/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/spacegate/data/levels/lastTeamStanding.oxw:9030-9215
/code/branches/spacerace/data/levels/lastTeamStanding.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/lastTeamStanding.oxw:8881-8996
/code/branches/steering/data/levels/lastTeamStanding.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/lastTeamStanding.oxw:9028-9199
/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/trunk/data/levels/lastTeamStanding.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/lastTeamStandingII.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/lastTeamStandingII.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/lastTeamStandingII.oxw:6584-7030
/code/branches/environment3/data/levels/lastTeamStandingII.oxw:8887-8975
/code/branches/formation/data/levels/lastTeamStandingII.oxw:8885-8991
/code/branches/fps/data/levels/lastTeamStandingII.oxw:6591-7072
/code/branches/gamecontent/data/levels/lastTeamStandingII.oxw:8893-8968
/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/hud/data/levels/lastTeamStandingII.oxw:8883-8986
/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/masterserverfix/data/levels/lastTeamStandingII.oxw:8933-8936
/code/branches/menu/data/levels/lastTeamStandingII.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/lastTeamStandingII.oxw:8884-8976
/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/newlevel2012/data/levels/lastTeamStandingII.oxw:9033-9240
/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/output/data/levels/lastTeamStandingII.oxw:8739-8857
/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/pickup2012/data/levels/lastTeamStandingII.oxw:9029-9189
/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/presentation/data/levels/lastTeamStandingII.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/lastTeamStandingII.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/lastTeamStandingII.oxw:8974-9015
/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/shipSelection/data/levels/lastTeamStandingII.oxw:9038-9206
/code/branches/skybox2/data/levels/lastTeamStandingII.oxw:6559-6989
/code/branches/sound/data/levels/lastTeamStandingII.oxw:2829-3010
/code/branches/sound2012/data/levels/lastTeamStandingII.oxw:9205-9240
/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/spacegate/data/levels/lastTeamStandingII.oxw:9030-9215
/code/branches/spacerace/data/levels/lastTeamStandingII.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/lastTeamStandingII.oxw:8881-8996
/code/branches/steering/data/levels/lastTeamStandingII.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/lastTeamStandingII.oxw:9028-9199
/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/trunk/data/levels/lastTeamStandingII.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/missionOne.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/gamecontent/data/levels/missionOne.oxw:8893-8968
/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/masterserverfix/data/levels/missionOne.oxw:8933-8936
/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/newlevel2012/data/levels/missionOne.oxw:9033-9240
/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/pickup2012/data/levels/missionOne.oxw:9029-9189
/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/presentation2011/data/levels/missionOne.oxw:8974-9015
/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/shipSelection/data/levels/missionOne.oxw:9038-9206
/code/branches/skybox2/data/levels/missionOne.oxw:6559-6989
/code/branches/sound/data/levels/missionOne.oxw:2829-3010
/code/branches/sound2012/data/levels/missionOne.oxw:9205-9240
/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/spacegate/data/levels/missionOne.oxw:9030-9215
/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/surfaceRace/data/levels/missionOne.oxw:9028-9199
/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/trunk/data/levels/missionOne.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/myTestLevel.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/myTestLevel.oxw:8887-8975
/code/branches/formation/data/levels/myTestLevel.oxw:8885-8991
/code/branches/fps/data/levels/myTestLevel.oxw:6591-7072
/code/branches/gamecontent/data/levels/myTestLevel.oxw:8893-8968
/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/hud/data/levels/myTestLevel.oxw:8883-8986
/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/masterserverfix/data/levels/myTestLevel.oxw:8933-8936
/code/branches/menu/data/levels/myTestLevel.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/myTestLevel.oxw:8884-8976
/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/newlevel2012/data/levels/myTestLevel.oxw:9033-9240
/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/output/data/levels/myTestLevel.oxw:8739-8857
/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/pickup2012/data/levels/myTestLevel.oxw:9029-9189
/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/presentation/data/levels/myTestLevel.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/myTestLevel.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/myTestLevel.oxw:8974-9015
/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/shipSelection/data/levels/myTestLevel.oxw:9038-9206
/code/branches/skybox2/data/levels/myTestLevel.oxw:6559-6989
/code/branches/sound/data/levels/myTestLevel.oxw:2829-3010
/code/branches/sound2012/data/levels/myTestLevel.oxw:9205-9240
/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/spacegate/data/levels/myTestLevel.oxw:9030-9215
/code/branches/spacerace/data/levels/myTestLevel.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/myTestLevel.oxw:8881-8996
/code/branches/steering/data/levels/myTestLevel.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/myTestLevel.oxw:9028-9199
/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/trunk/data/levels/myTestLevel.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/notifications.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/notifications.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/notifications.oxw:6584-7030
/code/branches/environment3/data/levels/notifications.oxw:8887-8975
/code/branches/formation/data/levels/notifications.oxw:8885-8991
/code/branches/fps/data/levels/notifications.oxw:6591-7072
/code/branches/gamecontent/data/levels/notifications.oxw:8893-8968
/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/hud/data/levels/notifications.oxw:8883-8986
/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/masterserverfix/data/levels/notifications.oxw:8933-8936
/code/branches/menu/data/levels/notifications.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/notifications.oxw:8884-8976
/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/newlevel2012/data/levels/notifications.oxw:9033-9240
/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/output/data/levels/notifications.oxw:8739-8857
/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/pickup2012/data/levels/notifications.oxw:9029-9189
/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/presentation/data/levels/notifications.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/notifications.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/notifications.oxw:8974-9015
/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/shipSelection/data/levels/notifications.oxw:9038-9206
/code/branches/skybox2/data/levels/notifications.oxw:6559-6989
/code/branches/sound/data/levels/notifications.oxw:2829-3010
/code/branches/sound2012/data/levels/notifications.oxw:9205-9240
/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/spacegate/data/levels/notifications.oxw:9030-9215
/code/branches/spacerace/data/levels/notifications.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/notifications.oxw:8881-8996
/code/branches/steering/data/levels/notifications.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/notifications.oxw:9028-9199
/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/usability/data/levels/notifications.oxw:7915-8078
/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/trunk/data/levels/notifications.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/old
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/old:8196-8560
/code/branches/dynamicmatch/data/levels/old:6584-7030
/code/branches/environment3/data/levels/old:8887-8975
/code/branches/formation/data/levels/old:8885-8991
/code/branches/fps/data/levels/old:6591-7072
/code/branches/gamecontent/data/levels/old:8893-8968
/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/hud/data/levels/old:8883-8986
/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/masterserverfix/data/levels/old:8933-8936
/code/branches/menu/data/levels/old:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/old:8884-8976
/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/newlevel2012/data/levels/old:9033-9240
/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/output/data/levels/old:8739-8857
/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/pickup2012/data/levels/old:9029-9189
/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/presentation/data/levels/old:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/old:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/old:8974-9015
/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/shipSelection/data/levels/old:9038-9206
/code/branches/skybox2/data/levels/old:6559-6989
/code/branches/sound/data/levels/old:2829-3010
/code/branches/sound2012/data/levels/old:9205-9240
/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/spacegate/data/levels/old:9030-9215
/code/branches/spacerace/data/levels/old:8182-8630
/code/branches/spaceraceTwo/data/levels/old:8881-8996
/code/branches/steering/data/levels/old:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/old:9028-9199
/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/usability/data/levels/old:7915-8078
/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/trunk/data/levels/old:9189-9204
Property changes on: code/branches/presentation2012/data/levels/pickups.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/pickups.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/pickups.oxw:6584-7030
/code/branches/environment3/data/levels/pickups.oxw:8887-8975
/code/branches/formation/data/levels/pickups.oxw:8885-8991
/code/branches/fps/data/levels/pickups.oxw:6591-7072
/code/branches/gamecontent/data/levels/pickups.oxw:8893-8968
/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/hud/data/levels/pickups.oxw:8883-8986
/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/masterserverfix/data/levels/pickups.oxw:8933-8936
/code/branches/menu/data/levels/pickups.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/pickups.oxw:8884-8976
/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/newlevel2012/data/levels/pickups.oxw:9033-9240
/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/output/data/levels/pickups.oxw:8739-8857
/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/pickup2012/data/levels/pickups.oxw:9029-9189
/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/presentation/data/levels/pickups.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/pickups.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/pickups.oxw:8974-9015
/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/shipSelection/data/levels/pickups.oxw:9038-9206
/code/branches/skybox2/data/levels/pickups.oxw:6559-6989
/code/branches/sound/data/levels/pickups.oxw:2829-3010
/code/branches/sound2012/data/levels/pickups.oxw:9205-9240
/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/spacegate/data/levels/pickups.oxw:9030-9215
/code/branches/spacerace/data/levels/pickups.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/pickups.oxw:8881-8996
/code/branches/steering/data/levels/pickups.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/pickups.oxw:9028-9199
/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/usability/data/levels/pickups.oxw:7915-8078
/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/trunk/data/levels/pickups.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/pirateAttack.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/pirateAttack.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/pirateAttack.oxw:6584-7030
/code/branches/environment3/data/levels/pirateAttack.oxw:8887-8975
/code/branches/formation/data/levels/pirateAttack.oxw:8885-8991
/code/branches/fps/data/levels/pirateAttack.oxw:6591-7072
/code/branches/gamecontent/data/levels/pirateAttack.oxw:8893-8968
/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/hud/data/levels/pirateAttack.oxw:8883-8986
/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/masterserverfix/data/levels/pirateAttack.oxw:8933-8936
/code/branches/menu/data/levels/pirateAttack.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/pirateAttack.oxw:8884-8976
/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/newlevel2012/data/levels/pirateAttack.oxw:9033-9240
/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/output/data/levels/pirateAttack.oxw:8739-8857
/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/pickup2012/data/levels/pirateAttack.oxw:9029-9189
/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/presentation/data/levels/pirateAttack.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/pirateAttack.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/pirateAttack.oxw:8974-9015
/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/shipSelection/data/levels/pirateAttack.oxw:9038-9206
/code/branches/skybox2/data/levels/pirateAttack.oxw:6559-6989
/code/branches/sound/data/levels/pirateAttack.oxw:2829-3010
/code/branches/sound2012/data/levels/pirateAttack.oxw:9205-9240
/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/spacegate/data/levels/pirateAttack.oxw:9030-9215
/code/branches/spacerace/data/levels/pirateAttack.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/pirateAttack.oxw:8881-8996
/code/branches/steering/data/levels/pirateAttack.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/pirateAttack.oxw:9028-9199
/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/usability/data/levels/pirateAttack.oxw:7915-8078
/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/trunk/data/levels/pirateAttack.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/planets.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/planets.oxw:8887-8975
/code/branches/formation/data/levels/planets.oxw:8885-8991
/code/branches/fps/data/levels/planets.oxw:6591-7072
/code/branches/gamecontent/data/levels/planets.oxw:8893-8968
/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/hud/data/levels/planets.oxw:8883-8986
/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/masterserverfix/data/levels/planets.oxw:8933-8936
/code/branches/menu/data/levels/planets.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/planets.oxw:8884-8976
/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/newlevel2012/data/levels/planets.oxw:9033-9240
/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/output/data/levels/planets.oxw:8739-8857
/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/pickup2012/data/levels/planets.oxw:9029-9189
/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/presentation/data/levels/planets.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/planets.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/planets.oxw:8974-9015
/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/shipSelection/data/levels/planets.oxw:9038-9206
/code/branches/skybox2/data/levels/planets.oxw:6559-6989
/code/branches/sound/data/levels/planets.oxw:2829-3010
/code/branches/sound2012/data/levels/planets.oxw:9205-9240
/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/spacegate/data/levels/planets.oxw:9030-9215
/code/branches/spacerace/data/levels/planets.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/planets.oxw:8881-8996
/code/branches/steering/data/levels/planets.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/planets.oxw:9028-9199
/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/trunk/data/levels/planets.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/pong.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/pong.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/pong.oxw:6584-7030
/code/branches/environment3/data/levels/pong.oxw:8887-8975
/code/branches/formation/data/levels/pong.oxw:8885-8991
/code/branches/fps/data/levels/pong.oxw:6591-7072
/code/branches/gamecontent/data/levels/pong.oxw:8893-8968
/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/hud/data/levels/pong.oxw:8883-8986
/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/masterserverfix/data/levels/pong.oxw:8933-8936
/code/branches/menu/data/levels/pong.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/pong.oxw:8884-8976
/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/newlevel2012/data/levels/pong.oxw:9033-9240
/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/output/data/levels/pong.oxw:8739-8857
/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/pickup2012/data/levels/pong.oxw:9029-9189
/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/presentation/data/levels/pong.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/pong.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/pong.oxw:8974-9015
/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/shipSelection/data/levels/pong.oxw:9038-9206
/code/branches/skybox2/data/levels/pong.oxw:6559-6989
/code/branches/sound/data/levels/pong.oxw:2829-3010
/code/branches/sound2012/data/levels/pong.oxw:9205-9240
/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/spacegate/data/levels/pong.oxw:9030-9215
/code/branches/spacerace/data/levels/pong.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/pong.oxw:8881-8996
/code/branches/steering/data/levels/pong.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/pong.oxw:9028-9199
/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/usability/data/levels/pong.oxw:7915-8078
/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/trunk/data/levels/pong.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/portals.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/portals.oxw:8887-8975
/code/branches/formation/data/levels/portals.oxw:8885-8991
/code/branches/fps/data/levels/portals.oxw:6591-7072
/code/branches/gamecontent/data/levels/portals.oxw:8893-8968
/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/hud/data/levels/portals.oxw:8883-8986
/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/masterserverfix/data/levels/portals.oxw:8933-8936
/code/branches/menu/data/levels/portals.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/portals.oxw:8884-8976
/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/newlevel2012/data/levels/portals.oxw:9033-9240
/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/output/data/levels/portals.oxw:8739-8857
/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/pickup2012/data/levels/portals.oxw:9029-9189
/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/presentation/data/levels/portals.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/portals.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/portals.oxw:8974-9015
/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/shipSelection/data/levels/portals.oxw:9038-9206
/code/branches/skybox2/data/levels/portals.oxw:6559-6989
/code/branches/sound/data/levels/portals.oxw:2829-3010
/code/branches/sound2012/data/levels/portals.oxw:9205-9240
/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/spacegate/data/levels/portals.oxw:9030-9215
/code/branches/spacerace/data/levels/portals.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/portals.oxw:8881-8996
/code/branches/steering/data/levels/portals.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/portals.oxw:9028-9199
/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/trunk/data/levels/portals.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/presentation.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/presentation.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/presentation.oxw:6584-7030
/code/branches/environment3/data/levels/presentation.oxw:8887-8975
/code/branches/formation/data/levels/presentation.oxw:8885-8991
/code/branches/fps/data/levels/presentation.oxw:6591-7072
/code/branches/gamecontent/data/levels/presentation.oxw:8893-8968
/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/hud/data/levels/presentation.oxw:8883-8986
/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/masterserverfix/data/levels/presentation.oxw:8933-8936
/code/branches/menu/data/levels/presentation.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/presentation.oxw:8884-8976
/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/newlevel2012/data/levels/presentation.oxw:9033-9240
/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/output/data/levels/presentation.oxw:8739-8857
/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/pickup2012/data/levels/presentation.oxw:9029-9189
/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/presentation/data/levels/presentation.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/presentation.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/presentation.oxw:8974-9015
/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/shipSelection/data/levels/presentation.oxw:9038-9206
/code/branches/skybox2/data/levels/presentation.oxw:6559-6989
/code/branches/sound/data/levels/presentation.oxw:2829-3010
/code/branches/sound2012/data/levels/presentation.oxw:9205-9240
/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/spacegate/data/levels/presentation.oxw:9030-9215
/code/branches/spacerace/data/levels/presentation.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/presentation.oxw:8881-8996
/code/branches/steering/data/levels/presentation.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/presentation.oxw:9028-9199
/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/usability/data/levels/presentation.oxw:7915-8078
/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/trunk/data/levels/presentation.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/presentation09.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/presentation09.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/presentation09.oxw:6584-7030
/code/branches/environment3/data/levels/presentation09.oxw:8887-8975
/code/branches/formation/data/levels/presentation09.oxw:8885-8991
/code/branches/fps/data/levels/presentation09.oxw:6591-7072
/code/branches/gamecontent/data/levels/presentation09.oxw:8893-8968
/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/hud/data/levels/presentation09.oxw:8883-8986
/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/masterserverfix/data/levels/presentation09.oxw:8933-8936
/code/branches/menu/data/levels/presentation09.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/presentation09.oxw:8884-8976
/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/newlevel2012/data/levels/presentation09.oxw:9033-9240
/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/output/data/levels/presentation09.oxw:8739-8857
/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/pickup2012/data/levels/presentation09.oxw:9029-9189
/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/presentation/data/levels/presentation09.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/presentation09.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/presentation09.oxw:8974-9015
/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/shipSelection/data/levels/presentation09.oxw:9038-9206
/code/branches/skybox2/data/levels/presentation09.oxw:6559-6989
/code/branches/sound/data/levels/presentation09.oxw:2829-3010
/code/branches/sound2012/data/levels/presentation09.oxw:9205-9240
/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/spacegate/data/levels/presentation09.oxw:9030-9215
/code/branches/spacerace/data/levels/presentation09.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/presentation09.oxw:8881-8996
/code/branches/steering/data/levels/presentation09.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/presentation09.oxw:9028-9199
/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/usability/data/levels/presentation09.oxw:7915-8078
/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/trunk/data/levels/presentation09.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/presentation09b.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/presentation09b.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/presentation09b.oxw:6584-7030
/code/branches/environment3/data/levels/presentation09b.oxw:8887-8975
/code/branches/formation/data/levels/presentation09b.oxw:8885-8991
/code/branches/fps/data/levels/presentation09b.oxw:6591-7072
/code/branches/gamecontent/data/levels/presentation09b.oxw:8893-8968
/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/hud/data/levels/presentation09b.oxw:8883-8986
/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/masterserverfix/data/levels/presentation09b.oxw:8933-8936
/code/branches/menu/data/levels/presentation09b.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/presentation09b.oxw:8884-8976
/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/newlevel2012/data/levels/presentation09b.oxw:9033-9240
/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/output/data/levels/presentation09b.oxw:8739-8857
/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/pickup2012/data/levels/presentation09b.oxw:9029-9189
/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/presentation/data/levels/presentation09b.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/presentation09b.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/presentation09b.oxw:8974-9015
/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/shipSelection/data/levels/presentation09b.oxw:9038-9206
/code/branches/skybox2/data/levels/presentation09b.oxw:6559-6989
/code/branches/sound/data/levels/presentation09b.oxw:2829-3010
/code/branches/sound2012/data/levels/presentation09b.oxw:9205-9240
/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/spacegate/data/levels/presentation09b.oxw:9030-9215
/code/branches/spacerace/data/levels/presentation09b.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/presentation09b.oxw:8881-8996
/code/branches/steering/data/levels/presentation09b.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/presentation09b.oxw:9028-9199
/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/usability/data/levels/presentation09b.oxw:7915-8078
/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/trunk/data/levels/presentation09b.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/presentationDM.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/presentationDM.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/presentationDM.oxw:6584-7030
/code/branches/environment3/data/levels/presentationDM.oxw:8887-8975
/code/branches/formation/data/levels/presentationDM.oxw:8885-8991
/code/branches/fps/data/levels/presentationDM.oxw:6591-7072
/code/branches/gamecontent/data/levels/presentationDM.oxw:8893-8968
/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/hud/data/levels/presentationDM.oxw:8883-8986
/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/masterserverfix/data/levels/presentationDM.oxw:8933-8936
/code/branches/menu/data/levels/presentationDM.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/presentationDM.oxw:8884-8976
/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/newlevel2012/data/levels/presentationDM.oxw:9033-9240
/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/output/data/levels/presentationDM.oxw:8739-8857
/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/pickup2012/data/levels/presentationDM.oxw:9029-9189
/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/presentation/data/levels/presentationDM.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/presentationDM.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/presentationDM.oxw:8974-9015
/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/shipSelection/data/levels/presentationDM.oxw:9038-9206
/code/branches/skybox2/data/levels/presentationDM.oxw:6559-6989
/code/branches/sound/data/levels/presentationDM.oxw:2829-3010
/code/branches/sound2012/data/levels/presentationDM.oxw:9205-9240
/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/spacegate/data/levels/presentationDM.oxw:9030-9215
/code/branches/spacerace/data/levels/presentationDM.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/presentationDM.oxw:8881-8996
/code/branches/steering/data/levels/presentationDM.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/presentationDM.oxw:9028-9199
/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/usability/data/levels/presentationDM.oxw:7915-8078
/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/trunk/data/levels/presentationDM.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/presentationFS10.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/presentationFS10.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/presentationFS10.oxw:6584-7030
/code/branches/environment3/data/levels/presentationFS10.oxw:8887-8975
/code/branches/formation/data/levels/presentationFS10.oxw:8885-8991
/code/branches/fps/data/levels/presentationFS10.oxw:6591-7072
/code/branches/gamecontent/data/levels/presentationFS10.oxw:8893-8968
/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/hud/data/levels/presentationFS10.oxw:8883-8986
/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/masterserverfix/data/levels/presentationFS10.oxw:8933-8936
/code/branches/menu/data/levels/presentationFS10.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/presentationFS10.oxw:8884-8976
/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/newlevel2012/data/levels/presentationFS10.oxw:9033-9240
/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/output/data/levels/presentationFS10.oxw:8739-8857
/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/pickup2012/data/levels/presentationFS10.oxw:9029-9189
/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/presentation/data/levels/presentationFS10.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/presentationFS10.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/presentationFS10.oxw:8974-9015
/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/shipSelection/data/levels/presentationFS10.oxw:9038-9206
/code/branches/skybox2/data/levels/presentationFS10.oxw:6559-6989
/code/branches/sound/data/levels/presentationFS10.oxw:2829-3010
/code/branches/sound2012/data/levels/presentationFS10.oxw:9205-9240
/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/spacegate/data/levels/presentationFS10.oxw:9030-9215
/code/branches/spacerace/data/levels/presentationFS10.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/presentationFS10.oxw:8881-8996
/code/branches/steering/data/levels/presentationFS10.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/presentationFS10.oxw:9028-9199
/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/usability/data/levels/presentationFS10.oxw:7915-8078
/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/trunk/data/levels/presentationFS10.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/presentationFS102.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/presentationFS102.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/presentationFS102.oxw:6584-7030
/code/branches/environment3/data/levels/presentationFS102.oxw:8887-8975
/code/branches/formation/data/levels/presentationFS102.oxw:8885-8991
/code/branches/fps/data/levels/presentationFS102.oxw:6591-7072
/code/branches/gamecontent/data/levels/presentationFS102.oxw:8893-8968
/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/hud/data/levels/presentationFS102.oxw:8883-8986
/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/masterserverfix/data/levels/presentationFS102.oxw:8933-8936
/code/branches/menu/data/levels/presentationFS102.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/presentationFS102.oxw:8884-8976
/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/newlevel2012/data/levels/presentationFS102.oxw:9033-9240
/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/output/data/levels/presentationFS102.oxw:8739-8857
/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/pickup2012/data/levels/presentationFS102.oxw:9029-9189
/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/presentation/data/levels/presentationFS102.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/presentationFS102.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/presentationFS102.oxw:8974-9015
/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/shipSelection/data/levels/presentationFS102.oxw:9038-9206
/code/branches/skybox2/data/levels/presentationFS102.oxw:6559-6989
/code/branches/sound/data/levels/presentationFS102.oxw:2829-3010
/code/branches/sound2012/data/levels/presentationFS102.oxw:9205-9240
/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/spacegate/data/levels/presentationFS102.oxw:9030-9215
/code/branches/spacerace/data/levels/presentationFS102.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/presentationFS102.oxw:8881-8996
/code/branches/steering/data/levels/presentationFS102.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/presentationFS102.oxw:9028-9199
/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/usability/data/levels/presentationFS102.oxw:7915-8078
/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/trunk/data/levels/presentationFS102.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/presentationFS10Ed.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/presentationFS10Ed.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/presentationFS10Ed.oxw:6584-7030
/code/branches/environment3/data/levels/presentationFS10Ed.oxw:8887-8975
/code/branches/formation/data/levels/presentationFS10Ed.oxw:8885-8991
/code/branches/fps/data/levels/presentationFS10Ed.oxw:6591-7072
/code/branches/gamecontent/data/levels/presentationFS10Ed.oxw:8893-8968
/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/hud/data/levels/presentationFS10Ed.oxw:8883-8986
/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/masterserverfix/data/levels/presentationFS10Ed.oxw:8933-8936
/code/branches/menu/data/levels/presentationFS10Ed.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/presentationFS10Ed.oxw:8884-8976
/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/newlevel2012/data/levels/presentationFS10Ed.oxw:9033-9240
/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/output/data/levels/presentationFS10Ed.oxw:8739-8857
/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/pickup2012/data/levels/presentationFS10Ed.oxw:9029-9189
/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/presentation/data/levels/presentationFS10Ed.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/presentationFS10Ed.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/presentationFS10Ed.oxw:8974-9015
/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/shipSelection/data/levels/presentationFS10Ed.oxw:9038-9206
/code/branches/skybox2/data/levels/presentationFS10Ed.oxw:6559-6989
/code/branches/sound/data/levels/presentationFS10Ed.oxw:2829-3010
/code/branches/sound2012/data/levels/presentationFS10Ed.oxw:9205-9240
/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/spacegate/data/levels/presentationFS10Ed.oxw:9030-9215
/code/branches/spacerace/data/levels/presentationFS10Ed.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/presentationFS10Ed.oxw:8881-8996
/code/branches/steering/data/levels/presentationFS10Ed.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/presentationFS10Ed.oxw:9028-9199
/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/usability/data/levels/presentationFS10Ed.oxw:7915-8078
/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/trunk/data/levels/presentationFS10Ed.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/presentationFS11.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/presentationFS11.oxw:8887-8975
/code/branches/formation/data/levels/presentationFS11.oxw:8885-8991
/code/branches/fps/data/levels/presentationFS11.oxw:6591-7072
/code/branches/gamecontent/data/levels/presentationFS11.oxw:8893-8968
/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/hud/data/levels/presentationFS11.oxw:8883-8986
/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/masterserverfix/data/levels/presentationFS11.oxw:8933-8936
/code/branches/menu/data/levels/presentationFS11.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/presentationFS11.oxw:8884-8976
/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/newlevel2012/data/levels/presentationFS11.oxw:9033-9240
/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/output/data/levels/presentationFS11.oxw:8739-8857
/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/pickup2012/data/levels/presentationFS11.oxw:9029-9189
/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/presentation/data/levels/presentationFS11.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/presentationFS11.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/presentationFS11.oxw:8974-9015
/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/shipSelection/data/levels/presentationFS11.oxw:9038-9206
/code/branches/skybox2/data/levels/presentationFS11.oxw:6559-6989
/code/branches/sound/data/levels/presentationFS11.oxw:2829-3010
/code/branches/sound2012/data/levels/presentationFS11.oxw:9205-9240
/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/spacegate/data/levels/presentationFS11.oxw:9030-9215
/code/branches/spacerace/data/levels/presentationFS11.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/presentationFS11.oxw:8881-8996
/code/branches/steering/data/levels/presentationFS11.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/presentationFS11.oxw:9028-9199
/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/trunk/data/levels/presentationFS11.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/presentationHS09.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/presentationHS09.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/presentationHS09.oxw:6584-7030
/code/branches/environment3/data/levels/presentationHS09.oxw:8887-8975
/code/branches/formation/data/levels/presentationHS09.oxw:8885-8991
/code/branches/fps/data/levels/presentationHS09.oxw:6591-7072
/code/branches/gamecontent/data/levels/presentationHS09.oxw:8893-8968
/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/hud/data/levels/presentationHS09.oxw:8883-8986
/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/masterserverfix/data/levels/presentationHS09.oxw:8933-8936
/code/branches/menu/data/levels/presentationHS09.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/presentationHS09.oxw:8884-8976
/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/newlevel2012/data/levels/presentationHS09.oxw:9033-9240
/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/output/data/levels/presentationHS09.oxw:8739-8857
/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/pickup2012/data/levels/presentationHS09.oxw:9029-9189
/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/presentation/data/levels/presentationHS09.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/presentationHS09.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/presentationHS09.oxw:8974-9015
/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/shipSelection/data/levels/presentationHS09.oxw:9038-9206
/code/branches/skybox2/data/levels/presentationHS09.oxw:6559-6989
/code/branches/sound/data/levels/presentationHS09.oxw:2829-3010
/code/branches/sound2012/data/levels/presentationHS09.oxw:9205-9240
/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/spacegate/data/levels/presentationHS09.oxw:9030-9215
/code/branches/spacerace/data/levels/presentationHS09.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/presentationHS09.oxw:8881-8996
/code/branches/steering/data/levels/presentationHS09.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/presentationHS09.oxw:9028-9199
/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/usability/data/levels/presentationHS09.oxw:7915-8078
/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/trunk/data/levels/presentationHS09.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/presentationHS09b.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/presentationHS09b.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/presentationHS09b.oxw:6584-7030
/code/branches/environment3/data/levels/presentationHS09b.oxw:8887-8975
/code/branches/formation/data/levels/presentationHS09b.oxw:8885-8991
/code/branches/fps/data/levels/presentationHS09b.oxw:6591-7072
/code/branches/gamecontent/data/levels/presentationHS09b.oxw:8893-8968
/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/hud/data/levels/presentationHS09b.oxw:8883-8986
/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/masterserverfix/data/levels/presentationHS09b.oxw:8933-8936
/code/branches/menu/data/levels/presentationHS09b.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/presentationHS09b.oxw:8884-8976
/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/newlevel2012/data/levels/presentationHS09b.oxw:9033-9240
/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/output/data/levels/presentationHS09b.oxw:8739-8857
/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/pickup2012/data/levels/presentationHS09b.oxw:9029-9189
/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/presentation/data/levels/presentationHS09b.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/presentationHS09b.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/presentationHS09b.oxw:8974-9015
/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/shipSelection/data/levels/presentationHS09b.oxw:9038-9206
/code/branches/skybox2/data/levels/presentationHS09b.oxw:6559-6989
/code/branches/sound/data/levels/presentationHS09b.oxw:2829-3010
/code/branches/sound2012/data/levels/presentationHS09b.oxw:9205-9240
/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/spacegate/data/levels/presentationHS09b.oxw:9030-9215
/code/branches/spacerace/data/levels/presentationHS09b.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/presentationHS09b.oxw:8881-8996
/code/branches/steering/data/levels/presentationHS09b.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/presentationHS09b.oxw:9028-9199
/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/usability/data/levels/presentationHS09b.oxw:7915-8078
/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/trunk/data/levels/presentationHS09b.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/presentationHS11.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/newlevel2012/data/levels/presentationHS11.oxw:9033-9240
/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/pickup2012/data/levels/presentationHS11.oxw:9029-9189
/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/presentation2011/data/levels/presentationHS11.oxw:8974-9015
/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/shipSelection/data/levels/presentationHS11.oxw:9038-9206
/code/branches/skybox2/data/levels/presentationHS11.oxw:6559-6989
/code/branches/sound/data/levels/presentationHS11.oxw:2829-3010
/code/branches/sound2012/data/levels/presentationHS11.oxw:9205-9240
/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/spacegate/data/levels/presentationHS11.oxw:9030-9215
/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/surfaceRace/data/levels/presentationHS11.oxw:9028-9199
/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/trunk/data/levels/presentationHS11.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/princessAeryn.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/princessAeryn.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/princessAeryn.oxw:6584-7030
/code/branches/environment3/data/levels/princessAeryn.oxw:8887-8975
/code/branches/formation/data/levels/princessAeryn.oxw:8885-8991
/code/branches/fps/data/levels/princessAeryn.oxw:6591-7072
/code/branches/gamecontent/data/levels/princessAeryn.oxw:8893-8968
/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/hud/data/levels/princessAeryn.oxw:8883-8986
/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/masterserverfix/data/levels/princessAeryn.oxw:8933-8936
/code/branches/menu/data/levels/princessAeryn.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/princessAeryn.oxw:8884-8976
/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/newlevel2012/data/levels/princessAeryn.oxw:9033-9240
/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/output/data/levels/princessAeryn.oxw:8739-8857
/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/pickup2012/data/levels/princessAeryn.oxw:9029-9189
/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/presentation/data/levels/princessAeryn.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/princessAeryn.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/princessAeryn.oxw:8974-9015
/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/shipSelection/data/levels/princessAeryn.oxw:9038-9206
/code/branches/skybox2/data/levels/princessAeryn.oxw:6559-6989
/code/branches/sound/data/levels/princessAeryn.oxw:2829-3010
/code/branches/sound2012/data/levels/princessAeryn.oxw:9205-9240
/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/spacegate/data/levels/princessAeryn.oxw:9030-9215
/code/branches/spacerace/data/levels/princessAeryn.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/princessAeryn.oxw:8881-8996
/code/branches/steering/data/levels/princessAeryn.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/princessAeryn.oxw:9028-9199
/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/usability/data/levels/princessAeryn.oxw:7915-8078
/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/trunk/data/levels/princessAeryn.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/quests.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/quests.oxw:8887-8975
/code/branches/formation/data/levels/quests.oxw:8885-8991
/code/branches/fps/data/levels/quests.oxw:6591-7072
/code/branches/gamecontent/data/levels/quests.oxw:8893-8968
/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/hud/data/levels/quests.oxw:8883-8986
/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/masterserverfix/data/levels/quests.oxw:8933-8936
/code/branches/menu/data/levels/quests.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/quests.oxw:8884-8976
/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/newlevel2012/data/levels/quests.oxw:9033-9240
/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/output/data/levels/quests.oxw:8739-8857
/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/pickup2012/data/levels/quests.oxw:9029-9189
/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/presentation/data/levels/quests.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/quests.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/quests.oxw:8974-9015
/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/shipSelection/data/levels/quests.oxw:9038-9206
/code/branches/skybox2/data/levels/quests.oxw:6559-6989
/code/branches/sound/data/levels/quests.oxw:2829-3010
/code/branches/sound2012/data/levels/quests.oxw:9205-9240
/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/spacegate/data/levels/quests.oxw:9030-9215
/code/branches/spacerace/data/levels/quests.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/quests.oxw:8881-8996
/code/branches/steering/data/levels/quests.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/quests.oxw:9028-9199
/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/trunk/data/levels/quests.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/screenshot.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/screenshot.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/screenshot.oxw:6584-7030
/code/branches/environment3/data/levels/screenshot.oxw:8887-8975
/code/branches/formation/data/levels/screenshot.oxw:8885-8991
/code/branches/fps/data/levels/screenshot.oxw:6591-7072
/code/branches/gamecontent/data/levels/screenshot.oxw:8893-8968
/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/hud/data/levels/screenshot.oxw:8883-8986
/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/masterserverfix/data/levels/screenshot.oxw:8933-8936
/code/branches/menu/data/levels/screenshot.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/screenshot.oxw:8884-8976
/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/newlevel2012/data/levels/screenshot.oxw:9033-9240
/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/output/data/levels/screenshot.oxw:8739-8857
/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/pickup2012/data/levels/screenshot.oxw:9029-9189
/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/presentation/data/levels/screenshot.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/screenshot.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/screenshot.oxw:8974-9015
/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/shipSelection/data/levels/screenshot.oxw:9038-9206
/code/branches/skybox2/data/levels/screenshot.oxw:6559-6989
/code/branches/sound/data/levels/screenshot.oxw:2829-3010
/code/branches/sound2012/data/levels/screenshot.oxw:9205-9240
/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/spacegate/data/levels/screenshot.oxw:9030-9215
/code/branches/spacerace/data/levels/screenshot.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/screenshot.oxw:8881-8996
/code/branches/steering/data/levels/screenshot.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/screenshot.oxw:9028-9199
/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/usability/data/levels/screenshot.oxw:7915-8078
/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/trunk/data/levels/screenshot.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/shieldTest.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/shieldTest.oxw:8887-8975
/code/branches/formation/data/levels/shieldTest.oxw:8885-8991
/code/branches/fps/data/levels/shieldTest.oxw:6591-7072
/code/branches/gamecontent/data/levels/shieldTest.oxw:8893-8968
/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/hud/data/levels/shieldTest.oxw:8883-8986
/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/masterserverfix/data/levels/shieldTest.oxw:8933-8936
/code/branches/menu/data/levels/shieldTest.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/shieldTest.oxw:8884-8976
/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/newlevel2012/data/levels/shieldTest.oxw:9033-9240
/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/output/data/levels/shieldTest.oxw:8739-8857
/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/pickup2012/data/levels/shieldTest.oxw:9029-9189
/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/presentation/data/levels/shieldTest.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/shieldTest.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/shieldTest.oxw:8974-9015
/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/shipSelection/data/levels/shieldTest.oxw:9038-9206
/code/branches/skybox2/data/levels/shieldTest.oxw:6559-6989
/code/branches/sound/data/levels/shieldTest.oxw:2829-3010
/code/branches/sound2012/data/levels/shieldTest.oxw:9205-9240
/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/spacegate/data/levels/shieldTest.oxw:9030-9215
/code/branches/spacerace/data/levels/shieldTest.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/shieldTest.oxw:8881-8996
/code/branches/steering/data/levels/shieldTest.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/shieldTest.oxw:9028-9199
/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/trunk/data/levels/shieldTest.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/sound.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/sound.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/sound.oxw:6584-7030
/code/branches/environment3/data/levels/sound.oxw:8887-8975
/code/branches/formation/data/levels/sound.oxw:8885-8991
/code/branches/fps/data/levels/sound.oxw:6591-7072
/code/branches/gamecontent/data/levels/sound.oxw:8893-8968
/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/hud/data/levels/sound.oxw:8883-8986
/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/masterserverfix/data/levels/sound.oxw:8933-8936
/code/branches/menu/data/levels/sound.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/sound.oxw:8884-8976
/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/newlevel2012/data/levels/sound.oxw:9033-9240
/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/output/data/levels/sound.oxw:8739-8857
/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/pickup2012/data/levels/sound.oxw:9029-9189
/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/presentation/data/levels/sound.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/sound.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/sound.oxw:8974-9015
/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/shipSelection/data/levels/sound.oxw:9038-9206
/code/branches/skybox2/data/levels/sound.oxw:6559-6989
/code/branches/sound/data/levels/sound.oxw:2829-3010
/code/branches/sound2012/data/levels/sound.oxw:9205-9240
/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/spacegate/data/levels/sound.oxw:9030-9215
/code/branches/spacerace/data/levels/sound.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/sound.oxw:8881-8996
/code/branches/steering/data/levels/sound.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/sound.oxw:9028-9199
/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/usability/data/levels/sound.oxw:7915-8078
/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/trunk/data/levels/sound.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/spaceRace.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/spaceRace.oxw:8887-8975
/code/branches/formation/data/levels/spaceRace.oxw:8885-8991
/code/branches/fps/data/levels/spaceRace.oxw:6591-7072
/code/branches/gamecontent/data/levels/spaceRace.oxw:8893-8968
/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/hud/data/levels/spaceRace.oxw:8883-8986
/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/masterserverfix/data/levels/spaceRace.oxw:8933-8936
/code/branches/menu/data/levels/spaceRace.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/spaceRace.oxw:8884-8976
/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/newlevel2012/data/levels/spaceRace.oxw:9033-9240
/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/output/data/levels/spaceRace.oxw:8739-8857
/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/pickup2012/data/levels/spaceRace.oxw:9029-9189
/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/presentation/data/levels/spaceRace.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/spaceRace.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/spaceRace.oxw:8974-9015
/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/shipSelection/data/levels/spaceRace.oxw:9038-9206
/code/branches/skybox2/data/levels/spaceRace.oxw:6559-6989
/code/branches/sound/data/levels/spaceRace.oxw:2829-3010
/code/branches/sound2012/data/levels/spaceRace.oxw:9205-9240
/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/spacegate/data/levels/spaceRace.oxw:9030-9215
/code/branches/spacerace/data/levels/spaceRace.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/spaceRace.oxw:8881-8996
/code/branches/steering/data/levels/spaceRace.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/spaceRace.oxw:9028-9199
/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/trunk/data/levels/spaceRace.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/surfaceRace.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/surfaceRace/data/levels/surfaceRace.oxw:9028-9199
/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
Property changes on: code/branches/presentation2012/data/levels/teamBaseMatch.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/teamBaseMatch.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/teamBaseMatch.oxw:6584-7030
/code/branches/environment3/data/levels/teamBaseMatch.oxw:8887-8975
/code/branches/formation/data/levels/teamBaseMatch.oxw:8885-8991
/code/branches/fps/data/levels/teamBaseMatch.oxw:6591-7072
/code/branches/gamecontent/data/levels/teamBaseMatch.oxw:8893-8968
/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/hud/data/levels/teamBaseMatch.oxw:8883-8986
/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/masterserverfix/data/levels/teamBaseMatch.oxw:8933-8936
/code/branches/menu/data/levels/teamBaseMatch.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/teamBaseMatch.oxw:8884-8976
/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/newlevel2012/data/levels/teamBaseMatch.oxw:9033-9240
/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/output/data/levels/teamBaseMatch.oxw:8739-8857
/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/pickup2012/data/levels/teamBaseMatch.oxw:9029-9189
/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/presentation/data/levels/teamBaseMatch.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/teamBaseMatch.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/teamBaseMatch.oxw:8974-9015
/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/shipSelection/data/levels/teamBaseMatch.oxw:9038-9206
/code/branches/skybox2/data/levels/teamBaseMatch.oxw:6559-6989
/code/branches/sound/data/levels/teamBaseMatch.oxw:2829-3010
/code/branches/sound2012/data/levels/teamBaseMatch.oxw:9205-9240
/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/spacegate/data/levels/teamBaseMatch.oxw:9030-9215
/code/branches/spacerace/data/levels/teamBaseMatch.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/teamBaseMatch.oxw:8881-8996
/code/branches/steering/data/levels/teamBaseMatch.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/teamBaseMatch.oxw:9028-9199
/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/usability/data/levels/teamBaseMatch.oxw:7915-8078
/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/trunk/data/levels/teamBaseMatch.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/teamDeathMatch.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/teamDeathMatch.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/teamDeathMatch.oxw:6584-7030
/code/branches/environment3/data/levels/teamDeathMatch.oxw:8887-8975
/code/branches/formation/data/levels/teamDeathMatch.oxw:8885-8991
/code/branches/fps/data/levels/teamDeathMatch.oxw:6591-7072
/code/branches/gamecontent/data/levels/teamDeathMatch.oxw:8893-8968
/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/hud/data/levels/teamDeathMatch.oxw:8883-8986
/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/masterserverfix/data/levels/teamDeathMatch.oxw:8933-8936
/code/branches/menu/data/levels/teamDeathMatch.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/teamDeathMatch.oxw:8884-8976
/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/newlevel2012/data/levels/teamDeathMatch.oxw:9033-9240
/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/output/data/levels/teamDeathMatch.oxw:8739-8857
/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/pickup2012/data/levels/teamDeathMatch.oxw:9029-9189
/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/presentation/data/levels/teamDeathMatch.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/teamDeathMatch.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/teamDeathMatch.oxw:8974-9015
/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/shipSelection/data/levels/teamDeathMatch.oxw:9038-9206
/code/branches/skybox2/data/levels/teamDeathMatch.oxw:6559-6989
/code/branches/sound/data/levels/teamDeathMatch.oxw:2829-3010
/code/branches/sound2012/data/levels/teamDeathMatch.oxw:9205-9240
/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/spacegate/data/levels/teamDeathMatch.oxw:9030-9215
/code/branches/spacerace/data/levels/teamDeathMatch.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/teamDeathMatch.oxw:8881-8996
/code/branches/steering/data/levels/teamDeathMatch.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/teamDeathMatch.oxw:9028-9199
/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/usability/data/levels/teamDeathMatch.oxw:7915-8078
/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/trunk/data/levels/teamDeathMatch.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates:8196-8560
/code/branches/dynamicmatch/data/levels/templates:6584-7030
/code/branches/environment3/data/levels/templates:8887-8975
/code/branches/formation/data/levels/templates:8885-8991
/code/branches/fps/data/levels/templates:6591-7072
/code/branches/gamecontent/data/levels/templates:8893-8968
/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/hud/data/levels/templates:8883-8986
/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/masterserverfix/data/levels/templates:8933-8936
/code/branches/menu/data/levels/templates:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates:8884-8976
/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/newlevel2012/data/levels/templates:9033-9240
/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/output/data/levels/templates:8739-8857
/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/pickup2012/data/levels/templates:9029-9189
/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/presentation/data/levels/templates:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates:8974-9015
/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/shipSelection/data/levels/templates:9038-9206
/code/branches/skybox2/data/levels/templates:6559-6989
/code/branches/sound/data/levels/templates:2829-3010
/code/branches/sound2012/data/levels/templates:9205-9214,9215-9240*
/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/spacegate/data/levels/templates:9030-9215
/code/branches/spacerace/data/levels/templates:8182-8630
/code/branches/spaceraceTwo/data/levels/templates:8881-8996
/code/branches/steering/data/levels/templates:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates:9028-9199
/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/usability/data/levels/templates:7915-8078
/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/trunk/data/levels/templates:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/FPS.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates/FPS.oxt:8196-8560
/code/branches/dynamicmatch/data/levels/templates/FPS.oxt:6584-7030
/code/branches/environment3/data/levels/templates/FPS.oxt:8887-8975
/code/branches/formation/data/levels/templates/FPS.oxt:8885-8991
/code/branches/fps/data/levels/templates/FPS.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/FPS.oxt:8893-8968
/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/hud/data/levels/templates/FPS.oxt:8883-8986
/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/masterserverfix/data/levels/templates/FPS.oxt:8933-8936
/code/branches/menu/data/levels/templates/FPS.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/FPS.oxt:8884-8976
/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/newlevel2012/data/levels/templates/FPS.oxt:9033-9240
/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/output/data/levels/templates/FPS.oxt:8739-8857
/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/pickup2012/data/levels/templates/FPS.oxt:9029-9189
/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/presentation/data/levels/templates/FPS.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/FPS.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/FPS.oxt:8974-9015
/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/shipSelection/data/levels/templates/FPS.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/FPS.oxt:6559-6989
/code/branches/sound/data/levels/templates/FPS.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/FPS.oxt:9205-9240
/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/spacegate/data/levels/templates/FPS.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/FPS.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/FPS.oxt:8881-8996
/code/branches/steering/data/levels/templates/FPS.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/FPS.oxt:9028-9199
/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/usability/data/levels/templates/FPS.oxt:7915-8078
/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/trunk/data/levels/templates/FPS.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/lodInformation.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates/lodInformation.oxt:8196-8560
/code/branches/dynamicmatch/data/levels/templates/lodInformation.oxt:6584-7030
/code/branches/environment3/data/levels/templates/lodInformation.oxt:8887-8975
/code/branches/formation/data/levels/templates/lodInformation.oxt:8885-8991
/code/branches/fps/data/levels/templates/lodInformation.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/lodInformation.oxt:8893-8968
/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/hud/data/levels/templates/lodInformation.oxt:8883-8986
/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/masterserverfix/data/levels/templates/lodInformation.oxt:8933-8936
/code/branches/menu/data/levels/templates/lodInformation.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/lodInformation.oxt:8884-8976
/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/newlevel2012/data/levels/templates/lodInformation.oxt:9033-9240
/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/output/data/levels/templates/lodInformation.oxt:8739-8857
/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/pickup2012/data/levels/templates/lodInformation.oxt:9029-9189
/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/presentation/data/levels/templates/lodInformation.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/lodInformation.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/lodInformation.oxt:8974-9015
/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/shipSelection/data/levels/templates/lodInformation.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/lodInformation.oxt:6559-6989
/code/branches/sound/data/levels/templates/lodInformation.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/lodInformation.oxt:9205-9240
/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/spacegate/data/levels/templates/lodInformation.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/lodInformation.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/lodInformation.oxt:8881-8996
/code/branches/steering/data/levels/templates/lodInformation.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/lodInformation.oxt:9028-9199
/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/usability/data/levels/templates/lodInformation.oxt:7915-8078
/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/trunk/data/levels/templates/lodInformation.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/pickupRepresentationTemplates.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates/pickupRepresentationTemplates.oxt:8196-8560
/code/branches/dynamicmatch/data/levels/templates/pickupRepresentationTemplates.oxt:6584-7030
/code/branches/environment3/data/levels/templates/pickupRepresentationTemplates.oxt:8887-8975
/code/branches/formation/data/levels/templates/pickupRepresentationTemplates.oxt:8885-8991
/code/branches/fps/data/levels/templates/pickupRepresentationTemplates.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/pickupRepresentationTemplates.oxt:8893-8968
/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/hud/data/levels/templates/pickupRepresentationTemplates.oxt:8883-8986
/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/masterserverfix/data/levels/templates/pickupRepresentationTemplates.oxt:8933-8936
/code/branches/menu/data/levels/templates/pickupRepresentationTemplates.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/pickupRepresentationTemplates.oxt:8884-8976
/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/newlevel2012/data/levels/templates/pickupRepresentationTemplates.oxt:9033-9240
/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/output/data/levels/templates/pickupRepresentationTemplates.oxt:8739-8857
/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/pickup2012/data/levels/templates/pickupRepresentationTemplates.oxt:9029-9189
/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/presentation/data/levels/templates/pickupRepresentationTemplates.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/pickupRepresentationTemplates.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/pickupRepresentationTemplates.oxt:8974-9015
/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/shipSelection/data/levels/templates/pickupRepresentationTemplates.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/pickupRepresentationTemplates.oxt:6559-6989
/code/branches/sound/data/levels/templates/pickupRepresentationTemplates.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/pickupRepresentationTemplates.oxt:9205-9240
/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/spacegate/data/levels/templates/pickupRepresentationTemplates.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/pickupRepresentationTemplates.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/pickupRepresentationTemplates.oxt:8881-8996
/code/branches/steering/data/levels/templates/pickupRepresentationTemplates.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/pickupRepresentationTemplates.oxt:9028-9199
/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/usability/data/levels/templates/pickupRepresentationTemplates.oxt:7915-8078
/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/trunk/data/levels/templates/pickupRepresentationTemplates.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/spaceshipAssff.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates/spaceshipAssff.oxt:8196-8560
/code/branches/dynamicmatch/data/levels/templates/spaceshipAssff.oxt:6584-7030
/code/branches/environment3/data/levels/templates/spaceshipAssff.oxt:8887-8975
/code/branches/formation/data/levels/templates/spaceshipAssff.oxt:8885-8991
/code/branches/fps/data/levels/templates/spaceshipAssff.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/spaceshipAssff.oxt:8893-8968
/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/hud/data/levels/templates/spaceshipAssff.oxt:8883-8986
/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/masterserverfix/data/levels/templates/spaceshipAssff.oxt:8933-8936
/code/branches/menu/data/levels/templates/spaceshipAssff.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/spaceshipAssff.oxt:8884-8976
/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/newlevel2012/data/levels/templates/spaceshipAssff.oxt:9033-9240
/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/output/data/levels/templates/spaceshipAssff.oxt:8739-8857
/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/pickup2012/data/levels/templates/spaceshipAssff.oxt:9029-9189
/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/presentation/data/levels/templates/spaceshipAssff.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/spaceshipAssff.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/spaceshipAssff.oxt:8974-9015
/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/shipSelection/data/levels/templates/spaceshipAssff.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/spaceshipAssff.oxt:6559-6989
/code/branches/sound/data/levels/templates/spaceshipAssff.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/spaceshipAssff.oxt:9205-9240
/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/spacegate/data/levels/templates/spaceshipAssff.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/spaceshipAssff.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/spaceshipAssff.oxt:8881-8996
/code/branches/steering/data/levels/templates/spaceshipAssff.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/spaceshipAssff.oxt:9028-9199
/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/usability/data/levels/templates/spaceshipAssff.oxt:7915-8078
/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/trunk/data/levels/templates/spaceshipAssff.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/spaceshipAssff2.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/templates/spaceshipAssff2.oxt:8887-8975
/code/branches/formation/data/levels/templates/spaceshipAssff2.oxt:8885-8991
/code/branches/fps/data/levels/templates/spaceshipAssff2.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/spaceshipAssff2.oxt:8893-8968
/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/hud/data/levels/templates/spaceshipAssff2.oxt:8883-8986
/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/masterserverfix/data/levels/templates/spaceshipAssff2.oxt:8933-8936
/code/branches/menu/data/levels/templates/spaceshipAssff2.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/spaceshipAssff2.oxt:8884-8976
/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/newlevel2012/data/levels/templates/spaceshipAssff2.oxt:9033-9240
/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/output/data/levels/templates/spaceshipAssff2.oxt:8739-8857
/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/pickup2012/data/levels/templates/spaceshipAssff2.oxt:9029-9189
/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/presentation/data/levels/templates/spaceshipAssff2.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/spaceshipAssff2.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/spaceshipAssff2.oxt:8974-9015
/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/shipSelection/data/levels/templates/spaceshipAssff2.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/spaceshipAssff2.oxt:6559-6989
/code/branches/sound/data/levels/templates/spaceshipAssff2.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/spaceshipAssff2.oxt:9205-9240
/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/spacegate/data/levels/templates/spaceshipAssff2.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/spaceshipAssff2.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/spaceshipAssff2.oxt:8881-8996
/code/branches/steering/data/levels/templates/spaceshipAssff2.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/spaceshipAssff2.oxt:9028-9199
/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/trunk/data/levels/templates/spaceshipAssff2.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/spaceshipGhost.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates/spaceshipGhost.oxt:8196-8560
/code/branches/dynamicmatch/data/levels/templates/spaceshipGhost.oxt:6584-7030
/code/branches/environment3/data/levels/templates/spaceshipGhost.oxt:8887-8975
/code/branches/formation/data/levels/templates/spaceshipGhost.oxt:8885-8991
/code/branches/fps/data/levels/templates/spaceshipGhost.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/spaceshipGhost.oxt:8893-8968
/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/hud/data/levels/templates/spaceshipGhost.oxt:8883-8986
/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/masterserverfix/data/levels/templates/spaceshipGhost.oxt:8933-8936
/code/branches/menu/data/levels/templates/spaceshipGhost.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/spaceshipGhost.oxt:8884-8976
/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/newlevel2012/data/levels/templates/spaceshipGhost.oxt:9033-9240
/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/output/data/levels/templates/spaceshipGhost.oxt:8739-8857
/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/pickup2012/data/levels/templates/spaceshipGhost.oxt:9029-9189
/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/presentation/data/levels/templates/spaceshipGhost.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/spaceshipGhost.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/spaceshipGhost.oxt:8974-9015
/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/shipSelection/data/levels/templates/spaceshipGhost.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/spaceshipGhost.oxt:6559-6989
/code/branches/sound/data/levels/templates/spaceshipGhost.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/spaceshipGhost.oxt:9205-9240
/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/spacegate/data/levels/templates/spaceshipGhost.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/spaceshipGhost.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/spaceshipGhost.oxt:8881-8996
/code/branches/steering/data/levels/templates/spaceshipGhost.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/spaceshipGhost.oxt:9028-9199
/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/usability/data/levels/templates/spaceshipGhost.oxt:7915-8078
/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/trunk/data/levels/templates/spaceshipGhost.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/spaceshipH2.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates/spaceshipH2.oxt:8196-8560
/code/branches/dynamicmatch/data/levels/templates/spaceshipH2.oxt:6584-7030
/code/branches/environment3/data/levels/templates/spaceshipH2.oxt:8887-8975
/code/branches/formation/data/levels/templates/spaceshipH2.oxt:8885-8991
/code/branches/fps/data/levels/templates/spaceshipH2.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/spaceshipH2.oxt:8893-8968
/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/hud/data/levels/templates/spaceshipH2.oxt:8883-8986
/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/masterserverfix/data/levels/templates/spaceshipH2.oxt:8933-8936
/code/branches/menu/data/levels/templates/spaceshipH2.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/spaceshipH2.oxt:8884-8976
/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/newlevel2012/data/levels/templates/spaceshipH2.oxt:9033-9240
/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/output/data/levels/templates/spaceshipH2.oxt:8739-8857
/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/pickup2012/data/levels/templates/spaceshipH2.oxt:9029-9189
/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/presentation/data/levels/templates/spaceshipH2.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/spaceshipH2.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/spaceshipH2.oxt:8974-9015
/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/shipSelection/data/levels/templates/spaceshipH2.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/spaceshipH2.oxt:6559-6989
/code/branches/sound/data/levels/templates/spaceshipH2.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/spaceshipH2.oxt:9205-9240
/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/spacegate/data/levels/templates/spaceshipH2.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/spaceshipH2.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/spaceshipH2.oxt:8881-8996
/code/branches/steering/data/levels/templates/spaceshipH2.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/spaceshipH2.oxt:9028-9199
/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/usability/data/levels/templates/spaceshipH2.oxt:7915-8078
/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/trunk/data/levels/templates/spaceshipH2.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/spaceshipHXY.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates/spaceshipHXY.oxt:8196-8560
/code/branches/dynamicmatch/data/levels/templates/spaceshipHXY.oxt:6584-7030
/code/branches/environment3/data/levels/templates/spaceshipHXY.oxt:8887-8975
/code/branches/formation/data/levels/templates/spaceshipHXY.oxt:8885-8991
/code/branches/fps/data/levels/templates/spaceshipHXY.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/spaceshipHXY.oxt:8893-8968
/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/hud/data/levels/templates/spaceshipHXY.oxt:8883-8986
/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/masterserverfix/data/levels/templates/spaceshipHXY.oxt:8933-8936
/code/branches/menu/data/levels/templates/spaceshipHXY.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/spaceshipHXY.oxt:8884-8976
/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/newlevel2012/data/levels/templates/spaceshipHXY.oxt:9033-9240
/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/output/data/levels/templates/spaceshipHXY.oxt:8739-8857
/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/pickup2012/data/levels/templates/spaceshipHXY.oxt:9029-9189
/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/presentation/data/levels/templates/spaceshipHXY.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/spaceshipHXY.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/spaceshipHXY.oxt:8974-9015
/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/shipSelection/data/levels/templates/spaceshipHXY.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/spaceshipHXY.oxt:6559-6989
/code/branches/sound/data/levels/templates/spaceshipHXY.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/spaceshipHXY.oxt:9205-9240
/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/spacegate/data/levels/templates/spaceshipHXY.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/spaceshipHXY.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/spaceshipHXY.oxt:8881-8996
/code/branches/steering/data/levels/templates/spaceshipHXY.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/spaceshipHXY.oxt:9028-9199
/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/usability/data/levels/templates/spaceshipHXY.oxt:7915-8078
/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/trunk/data/levels/templates/spaceshipHXY.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/spaceshipHXYSL.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates/spaceshipHXYSL.oxt:8196-8560
/code/branches/dynamicmatch/data/levels/templates/spaceshipHXYSL.oxt:6584-7030
/code/branches/environment3/data/levels/templates/spaceshipHXYSL.oxt:8887-8975
/code/branches/formation/data/levels/templates/spaceshipHXYSL.oxt:8885-8991
/code/branches/fps/data/levels/templates/spaceshipHXYSL.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/spaceshipHXYSL.oxt:8893-8968
/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/hud/data/levels/templates/spaceshipHXYSL.oxt:8883-8986
/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/masterserverfix/data/levels/templates/spaceshipHXYSL.oxt:8933-8936
/code/branches/menu/data/levels/templates/spaceshipHXYSL.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/spaceshipHXYSL.oxt:8884-8976
/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/newlevel2012/data/levels/templates/spaceshipHXYSL.oxt:9033-9240
/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/output/data/levels/templates/spaceshipHXYSL.oxt:8739-8857
/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/pickup2012/data/levels/templates/spaceshipHXYSL.oxt:9029-9189
/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/presentation/data/levels/templates/spaceshipHXYSL.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/spaceshipHXYSL.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/spaceshipHXYSL.oxt:8974-9015
/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/shipSelection/data/levels/templates/spaceshipHXYSL.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/spaceshipHXYSL.oxt:6559-6989
/code/branches/sound/data/levels/templates/spaceshipHXYSL.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/spaceshipHXYSL.oxt:9205-9240
/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/spacegate/data/levels/templates/spaceshipHXYSL.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/spaceshipHXYSL.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/spaceshipHXYSL.oxt:8881-8996
/code/branches/steering/data/levels/templates/spaceshipHXYSL.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/spaceshipHXYSL.oxt:9028-9199
/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/usability/data/levels/templates/spaceshipHXYSL.oxt:7915-8078
/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/trunk/data/levels/templates/spaceshipHXYSL.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/spaceshipPirate.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates/spaceshipPirate.oxt:8196-8560
/code/branches/dynamicmatch/data/levels/templates/spaceshipPirate.oxt:6584-7030
/code/branches/environment3/data/levels/templates/spaceshipPirate.oxt:8887-8975
/code/branches/formation/data/levels/templates/spaceshipPirate.oxt:8885-8991
/code/branches/fps/data/levels/templates/spaceshipPirate.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/spaceshipPirate.oxt:8893-8968
/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/hud/data/levels/templates/spaceshipPirate.oxt:8883-8986
/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/masterserverfix/data/levels/templates/spaceshipPirate.oxt:8933-8936
/code/branches/menu/data/levels/templates/spaceshipPirate.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/spaceshipPirate.oxt:8884-8976
/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/newlevel2012/data/levels/templates/spaceshipPirate.oxt:9033-9240
/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/output/data/levels/templates/spaceshipPirate.oxt:8739-8857
/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/pickup2012/data/levels/templates/spaceshipPirate.oxt:9029-9189
/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/presentation/data/levels/templates/spaceshipPirate.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/spaceshipPirate.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/spaceshipPirate.oxt:8974-9015
/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/shipSelection/data/levels/templates/spaceshipPirate.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/spaceshipPirate.oxt:6559-6989
/code/branches/sound/data/levels/templates/spaceshipPirate.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/spaceshipPirate.oxt:9205-9240
/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/spacegate/data/levels/templates/spaceshipPirate.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/spaceshipPirate.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/spaceshipPirate.oxt:8881-8996
/code/branches/steering/data/levels/templates/spaceshipPirate.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/spaceshipPirate.oxt:9028-9199
/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/usability/data/levels/templates/spaceshipPirate.oxt:7915-8078
/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/trunk/data/levels/templates/spaceshipPirate.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/spaceshipRace.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/surfaceRace/data/levels/templates/spaceshipRace.oxt:9028-9199
/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
Property changes on: code/branches/presentation2012/data/levels/templates/spaceshipSpacecruiser.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxt:8893-8968
/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/masterserverfix/data/levels/templates/spaceshipSpacecruiser.oxt:8933-8936
/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/newlevel2012/data/levels/templates/spaceshipSpacecruiser.oxt:9033-9240
/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/pickup2012/data/levels/templates/spaceshipSpacecruiser.oxt:9029-9189
/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/presentation2011/data/levels/templates/spaceshipSpacecruiser.oxt:8974-9015
/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/shipSelection/data/levels/templates/spaceshipSpacecruiser.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/spaceshipSpacecruiser.oxt:6559-6989
/code/branches/sound/data/levels/templates/spaceshipSpacecruiser.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/spaceshipSpacecruiser.oxt:9205-9240
/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/spacegate/data/levels/templates/spaceshipSpacecruiser.oxt:9030-9215
/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/surfaceRace/data/levels/templates/spaceshipSpacecruiser.oxt:9028-9199
/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/trunk/data/levels/templates/spaceshipSpacecruiser.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/spaceshipSwallow.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates/spaceshipSwallow.oxt:8196-8560
/code/branches/dynamicmatch/data/levels/templates/spaceshipSwallow.oxt:6584-7030
/code/branches/environment3/data/levels/templates/spaceshipSwallow.oxt:8887-8975
/code/branches/formation/data/levels/templates/spaceshipSwallow.oxt:8885-8991
/code/branches/fps/data/levels/templates/spaceshipSwallow.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/spaceshipSwallow.oxt:8893-8968
/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/hud/data/levels/templates/spaceshipSwallow.oxt:8883-8986
/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/masterserverfix/data/levels/templates/spaceshipSwallow.oxt:8933-8936
/code/branches/menu/data/levels/templates/spaceshipSwallow.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/spaceshipSwallow.oxt:8884-8976
/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/newlevel2012/data/levels/templates/spaceshipSwallow.oxt:9033-9240
/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/output/data/levels/templates/spaceshipSwallow.oxt:8739-8857
/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/pickup2012/data/levels/templates/spaceshipSwallow.oxt:9029-9189
/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/presentation/data/levels/templates/spaceshipSwallow.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/spaceshipSwallow.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/spaceshipSwallow.oxt:8974-9015
/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/shipSelection/data/levels/templates/spaceshipSwallow.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/spaceshipSwallow.oxt:6559-6989
/code/branches/sound/data/levels/templates/spaceshipSwallow.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/spaceshipSwallow.oxt:9205-9240
/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/spacegate/data/levels/templates/spaceshipSwallow.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/spaceshipSwallow.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/spaceshipSwallow.oxt:8881-8996
/code/branches/steering/data/levels/templates/spaceshipSwallow.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/spaceshipSwallow.oxt:9028-9199
/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/usability/data/levels/templates/spaceshipSwallow.oxt:7915-8078
/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/trunk/data/levels/templates/spaceshipSwallow.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/spaceshipTransporter.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates/spaceshipTransporter.oxt:8196-8560
/code/branches/dynamicmatch/data/levels/templates/spaceshipTransporter.oxt:6584-7030
/code/branches/environment3/data/levels/templates/spaceshipTransporter.oxt:8887-8975
/code/branches/formation/data/levels/templates/spaceshipTransporter.oxt:8885-8991
/code/branches/fps/data/levels/templates/spaceshipTransporter.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/spaceshipTransporter.oxt:8893-8968
/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/hud/data/levels/templates/spaceshipTransporter.oxt:8883-8986
/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/masterserverfix/data/levels/templates/spaceshipTransporter.oxt:8933-8936
/code/branches/menu/data/levels/templates/spaceshipTransporter.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/spaceshipTransporter.oxt:8884-8976
/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/newlevel2012/data/levels/templates/spaceshipTransporter.oxt:9033-9240
/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/output/data/levels/templates/spaceshipTransporter.oxt:8739-8857
/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/pickup2012/data/levels/templates/spaceshipTransporter.oxt:9029-9189
/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/presentation/data/levels/templates/spaceshipTransporter.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/spaceshipTransporter.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/spaceshipTransporter.oxt:8974-9015
/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/shipSelection/data/levels/templates/spaceshipTransporter.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/spaceshipTransporter.oxt:6559-6989
/code/branches/sound/data/levels/templates/spaceshipTransporter.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/spaceshipTransporter.oxt:9205-9240
/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/spacegate/data/levels/templates/spaceshipTransporter.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/spaceshipTransporter.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/spaceshipTransporter.oxt:8881-8996
/code/branches/steering/data/levels/templates/spaceshipTransporter.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/spaceshipTransporter.oxt:9028-9199
/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/usability/data/levels/templates/spaceshipTransporter.oxt:7915-8078
/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/trunk/data/levels/templates/spaceshipTransporter.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/templates/spaceshipTransporterSL.oxt
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/templates/spaceshipTransporterSL.oxt:8196-8560
/code/branches/dynamicmatch/data/levels/templates/spaceshipTransporterSL.oxt:6584-7030
/code/branches/environment3/data/levels/templates/spaceshipTransporterSL.oxt:8887-8975
/code/branches/formation/data/levels/templates/spaceshipTransporterSL.oxt:8885-8991
/code/branches/fps/data/levels/templates/spaceshipTransporterSL.oxt:6591-7072
/code/branches/gamecontent/data/levels/templates/spaceshipTransporterSL.oxt:8893-8968
/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/hud/data/levels/templates/spaceshipTransporterSL.oxt:8883-8986
/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/masterserverfix/data/levels/templates/spaceshipTransporterSL.oxt:8933-8936
/code/branches/menu/data/levels/templates/spaceshipTransporterSL.oxt:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/templates/spaceshipTransporterSL.oxt:8884-8976
/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/newlevel2012/data/levels/templates/spaceshipTransporterSL.oxt:9033-9240
/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/output/data/levels/templates/spaceshipTransporterSL.oxt:8739-8857
/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/pickup2012/data/levels/templates/spaceshipTransporterSL.oxt:9029-9189
/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/presentation/data/levels/templates/spaceshipTransporterSL.oxt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/templates/spaceshipTransporterSL.oxt:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/templates/spaceshipTransporterSL.oxt:8974-9015
/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/shipSelection/data/levels/templates/spaceshipTransporterSL.oxt:9038-9206
/code/branches/skybox2/data/levels/templates/spaceshipTransporterSL.oxt:6559-6989
/code/branches/sound/data/levels/templates/spaceshipTransporterSL.oxt:2829-3010
/code/branches/sound2012/data/levels/templates/spaceshipTransporterSL.oxt:9205-9240
/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/spacegate/data/levels/templates/spaceshipTransporterSL.oxt:9030-9215
/code/branches/spacerace/data/levels/templates/spaceshipTransporterSL.oxt:8182-8630
/code/branches/spaceraceTwo/data/levels/templates/spaceshipTransporterSL.oxt:8881-8996
/code/branches/steering/data/levels/templates/spaceshipTransporterSL.oxt:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/templates/spaceshipTransporterSL.oxt:9028-9199
/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/usability/data/levels/templates/spaceshipTransporterSL.oxt:7915-8078
/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/trunk/data/levels/templates/spaceshipTransporterSL.oxt:9189-9204
Property changes on: code/branches/presentation2012/data/levels/testStars.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/testStars.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/testStars.oxw:6584-7030
/code/branches/environment3/data/levels/testStars.oxw:8887-8975
/code/branches/formation/data/levels/testStars.oxw:8885-8991
/code/branches/fps/data/levels/testStars.oxw:6591-7072
/code/branches/gamecontent/data/levels/testStars.oxw:8893-8968
/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/hud/data/levels/testStars.oxw:8883-8986
/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/masterserverfix/data/levels/testStars.oxw:8933-8936
/code/branches/menu/data/levels/testStars.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/testStars.oxw:8884-8976
/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/newlevel2012/data/levels/testStars.oxw:9033-9240
/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/output/data/levels/testStars.oxw:8739-8857
/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/pickup2012/data/levels/testStars.oxw:9029-9189
/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/presentation/data/levels/testStars.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/testStars.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/testStars.oxw:8974-9015
/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/shipSelection/data/levels/testStars.oxw:9038-9206
/code/branches/skybox2/data/levels/testStars.oxw:6559-6989
/code/branches/sound/data/levels/testStars.oxw:2829-3010
/code/branches/sound2012/data/levels/testStars.oxw:9205-9240
/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/spacegate/data/levels/testStars.oxw:9030-9215
/code/branches/spacerace/data/levels/testStars.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/testStars.oxw:8881-8996
/code/branches/steering/data/levels/testStars.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/testStars.oxw:9028-9199
/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/usability/data/levels/testStars.oxw:7915-8078
/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/trunk/data/levels/testStars.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/testSwallow.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/testSwallow.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/testSwallow.oxw:6584-7030
/code/branches/environment3/data/levels/testSwallow.oxw:8887-8975
/code/branches/formation/data/levels/testSwallow.oxw:8885-8991
/code/branches/fps/data/levels/testSwallow.oxw:6591-7072
/code/branches/gamecontent/data/levels/testSwallow.oxw:8893-8968
/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/hud/data/levels/testSwallow.oxw:8883-8986
/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/masterserverfix/data/levels/testSwallow.oxw:8933-8936
/code/branches/menu/data/levels/testSwallow.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/testSwallow.oxw:8884-8976
/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/newlevel2012/data/levels/testSwallow.oxw:9033-9240
/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/output/data/levels/testSwallow.oxw:8739-8857
/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/pickup2012/data/levels/testSwallow.oxw:9029-9189
/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/presentation/data/levels/testSwallow.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/testSwallow.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/testSwallow.oxw:8974-9015
/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/shipSelection/data/levels/testSwallow.oxw:9038-9206
/code/branches/skybox2/data/levels/testSwallow.oxw:6559-6989
/code/branches/sound/data/levels/testSwallow.oxw:2829-3010
/code/branches/sound2012/data/levels/testSwallow.oxw:9205-9240
/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/spacegate/data/levels/testSwallow.oxw:9030-9215
/code/branches/spacerace/data/levels/testSwallow.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/testSwallow.oxw:8881-8996
/code/branches/steering/data/levels/testSwallow.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/testSwallow.oxw:9028-9199
/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/usability/data/levels/testSwallow.oxw:7915-8078
/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/trunk/data/levels/testSwallow.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/tetris.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/environment3/data/levels/tetris.oxw:8887-8975
/code/branches/formation/data/levels/tetris.oxw:8885-8991
/code/branches/fps/data/levels/tetris.oxw:6591-7072
/code/branches/gamecontent/data/levels/tetris.oxw:8893-8968
/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/hud/data/levels/tetris.oxw:8883-8986
/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/masterserverfix/data/levels/tetris.oxw:8933-8936
/code/branches/menu/data/levels/tetris.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/tetris.oxw:8884-8976
/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/newlevel2012/data/levels/tetris.oxw:9033-9240
/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/output/data/levels/tetris.oxw:8739-8857
/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/pickup2012/data/levels/tetris.oxw:9029-9189
/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/presentation/data/levels/tetris.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/tetris.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/tetris.oxw:8974-9015
/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/shipSelection/data/levels/tetris.oxw:9038-9206
/code/branches/skybox2/data/levels/tetris.oxw:6559-6989
/code/branches/sound/data/levels/tetris.oxw:2829-3010
/code/branches/sound2012/data/levels/tetris.oxw:9205-9240
/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/spacegate/data/levels/tetris.oxw:9030-9215
/code/branches/spacerace/data/levels/tetris.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/tetris.oxw:8881-8996
/code/branches/steering/data/levels/tetris.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/tetris.oxw:9028-9199
/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/trunk/data/levels/tetris.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/theTimeMachine.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/theTimeMachine.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/theTimeMachine.oxw:6584-7030
/code/branches/environment3/data/levels/theTimeMachine.oxw:8887-8975
/code/branches/formation/data/levels/theTimeMachine.oxw:8885-8991
/code/branches/fps/data/levels/theTimeMachine.oxw:6591-7072
/code/branches/gamecontent/data/levels/theTimeMachine.oxw:8893-8968
/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/hud/data/levels/theTimeMachine.oxw:8883-8986
/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/masterserverfix/data/levels/theTimeMachine.oxw:8933-8936
/code/branches/menu/data/levels/theTimeMachine.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/theTimeMachine.oxw:8884-8976
/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/newlevel2012/data/levels/theTimeMachine.oxw:9033-9240
/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/output/data/levels/theTimeMachine.oxw:8739-8857
/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/pickup2012/data/levels/theTimeMachine.oxw:9029-9189
/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/presentation/data/levels/theTimeMachine.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/theTimeMachine.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/theTimeMachine.oxw:8974-9015
/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/shipSelection/data/levels/theTimeMachine.oxw:9038-9206
/code/branches/skybox2/data/levels/theTimeMachine.oxw:6559-6989
/code/branches/sound/data/levels/theTimeMachine.oxw:2829-3010
/code/branches/sound2012/data/levels/theTimeMachine.oxw:9205-9240
/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/spacegate/data/levels/theTimeMachine.oxw:9030-9215
/code/branches/spacerace/data/levels/theTimeMachine.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/theTimeMachine.oxw:8881-8996
/code/branches/steering/data/levels/theTimeMachine.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/theTimeMachine.oxw:9028-9199
/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/usability/data/levels/theTimeMachine.oxw:7915-8078
/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/trunk/data/levels/theTimeMachine.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/tutorial.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/tutorial.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/tutorial.oxw:6584-7030
/code/branches/environment3/data/levels/tutorial.oxw:8887-8975
/code/branches/formation/data/levels/tutorial.oxw:8885-8991
/code/branches/fps/data/levels/tutorial.oxw:6591-7072
/code/branches/gamecontent/data/levels/tutorial.oxw:8893-8968
/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/hud/data/levels/tutorial.oxw:8883-8986
/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/masterserverfix/data/levels/tutorial.oxw:8933-8936
/code/branches/menu/data/levels/tutorial.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/tutorial.oxw:8884-8976
/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/newlevel2012/data/levels/tutorial.oxw:9033-9240
/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/output/data/levels/tutorial.oxw:8739-8857
/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/pickup2012/data/levels/tutorial.oxw:9029-9189
/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/presentation/data/levels/tutorial.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/tutorial.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/tutorial.oxw:8974-9015
/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/shipSelection/data/levels/tutorial.oxw:9038-9206
/code/branches/skybox2/data/levels/tutorial.oxw:6559-6989
/code/branches/sound/data/levels/tutorial.oxw:2829-3010
/code/branches/sound2012/data/levels/tutorial.oxw:9205-9240
/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/spacegate/data/levels/tutorial.oxw:9030-9215
/code/branches/spacerace/data/levels/tutorial.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/tutorial.oxw:8881-8996
/code/branches/steering/data/levels/tutorial.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/tutorial.oxw:9028-9199
/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/usability/data/levels/tutorial.oxw:7915-8078
/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/trunk/data/levels/tutorial.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/underAttack.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/underAttack.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/underAttack.oxw:6584-7030
/code/branches/environment3/data/levels/underAttack.oxw:8887-8975
/code/branches/formation/data/levels/underAttack.oxw:8885-8991
/code/branches/fps/data/levels/underAttack.oxw:6591-7072
/code/branches/gamecontent/data/levels/underAttack.oxw:8893-8968
/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/hud/data/levels/underAttack.oxw:8883-8986
/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/masterserverfix/data/levels/underAttack.oxw:8933-8936
/code/branches/menu/data/levels/underAttack.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/underAttack.oxw:8884-8976
/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/newlevel2012/data/levels/underAttack.oxw:9033-9240
/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/output/data/levels/underAttack.oxw:8739-8857
/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/pickup2012/data/levels/underAttack.oxw:9029-9189
/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/presentation/data/levels/underAttack.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/underAttack.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/underAttack.oxw:8974-9015
/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/shipSelection/data/levels/underAttack.oxw:9038-9206
/code/branches/skybox2/data/levels/underAttack.oxw:6559-6989
/code/branches/sound/data/levels/underAttack.oxw:2829-3010
/code/branches/sound2012/data/levels/underAttack.oxw:9205-9240
/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/spacegate/data/levels/underAttack.oxw:9030-9215
/code/branches/spacerace/data/levels/underAttack.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/underAttack.oxw:8881-8996
/code/branches/steering/data/levels/underAttack.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/underAttack.oxw:9028-9199
/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/usability/data/levels/underAttack.oxw:7915-8078
/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/trunk/data/levels/underAttack.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/levels/waypoints.oxw
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/levels/waypoints.oxw:8196-8560
/code/branches/dynamicmatch/data/levels/waypoints.oxw:6584-7030
/code/branches/environment3/data/levels/waypoints.oxw:8887-8975
/code/branches/formation/data/levels/waypoints.oxw:8885-8991
/code/branches/fps/data/levels/waypoints.oxw:6591-7072
/code/branches/gamecontent/data/levels/waypoints.oxw:8893-8968
/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/hud/data/levels/waypoints.oxw:8883-8986
/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/masterserverfix/data/levels/waypoints.oxw:8933-8936
/code/branches/menu/data/levels/waypoints.oxw:5941-6146,6148,7536-7687
/code/branches/menue/data/levels/waypoints.oxw:8884-8976
/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/newlevel2012/data/levels/waypoints.oxw:9033-9240
/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/output/data/levels/waypoints.oxw:8739-8857
/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/pickup2012/data/levels/waypoints.oxw:9029-9189
/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/presentation/data/levels/waypoints.oxw:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/levels/waypoints.oxw:6106-6416,7787-7800
/code/branches/presentation2011/data/levels/waypoints.oxw:8974-9015
/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/shipSelection/data/levels/waypoints.oxw:9038-9206
/code/branches/skybox2/data/levels/waypoints.oxw:6559-6989
/code/branches/sound/data/levels/waypoints.oxw:2829-3010
/code/branches/sound2012/data/levels/waypoints.oxw:9205-9240
/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/spacegate/data/levels/waypoints.oxw:9030-9215
/code/branches/spacerace/data/levels/waypoints.oxw:8182-8630
/code/branches/spaceraceTwo/data/levels/waypoints.oxw:8881-8996
/code/branches/steering/data/levels/waypoints.oxw:5949-6091,8140-8595
/code/branches/surfaceRace/data/levels/waypoints.oxw:9028-9199
/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/usability/data/levels/waypoints.oxw:7915-8078
/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/trunk/data/levels/waypoints.oxw:9189-9204
Property changes on: code/branches/presentation2012/data/overlays
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/overlays:8196-8560
/code/branches/dynamicmatch/data/overlays:6584-7030
/code/branches/environment3/data/overlays:8887-8975
/code/branches/formation/data/overlays:8885-8991
/code/branches/fps/data/overlays:6591-7072
/code/branches/gamecontent/data/overlays:8893-8968
/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/hud/data/overlays:8883-8986
/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/masterserverfix/data/overlays:8933-8936
/code/branches/menu/data/overlays:5941-6146,6148,7536-7687
/code/branches/menue/data/overlays:8884-8976
/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/newlevel2012/data/overlays:9033-9240
/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/output/data/overlays:8739-8857
/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/pickup2012/data/overlays:9029-9189
/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/presentation/data/overlays:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/overlays:6106-6416,7787-7800
/code/branches/presentation2011/data/overlays:8974-9015
/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/shipSelection/data/overlays:9038-9206
/code/branches/skybox2/data/overlays:6559-6989
/code/branches/sound/data/overlays:2829-3010
/code/branches/sound2012/data/overlays:9205-9214,9215-9240*
/code/branches/sound3/data/overlays:5941-6102
/code/branches/spaceboundaries/data/overlays:8085-8457
/code/branches/spaceboundaries2/data/overlays:8460-8613
/code/branches/spacegate/data/overlays:9030-9215
/code/branches/spacerace/data/overlays:8182-8630
/code/branches/spaceraceTwo/data/overlays:8881-8996
/code/branches/steering/data/overlays:5949-6091,8140-8595
/code/branches/surfaceRace/data/overlays:9028-9199
/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/usability/data/overlays:7915-8078
/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/trunk/data/overlays:9189-9204
Property changes on: code/branches/presentation2012/data/overlays/HUD.oxo
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/overlays/HUD.oxo:8196-8560
/code/branches/dynamicmatch/data/overlays/HUD.oxo:6584-7030
/code/branches/environment3/data/overlays/HUD.oxo:8887-8975
/code/branches/formation/data/overlays/HUD.oxo:8885-8991
/code/branches/fps/data/overlays/HUD.oxo:6591-7072
/code/branches/gamecontent/data/overlays/HUD.oxo:8893-8968
/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/hud/data/overlays/HUD.oxo:8883-8986
/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/masterserverfix/data/overlays/HUD.oxo:8933-8936
/code/branches/menu/data/overlays/HUD.oxo:5941-6146,6148,7536-7687
/code/branches/menue/data/overlays/HUD.oxo:8884-8976
/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/newlevel2012/data/overlays/HUD.oxo:9033-9240
/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/output/data/overlays/HUD.oxo:8739-8857
/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/pickup2012/data/overlays/HUD.oxo:9029-9189
/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/presentation/data/overlays/HUD.oxo:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/overlays/HUD.oxo:6106-6416,7787-7800
/code/branches/presentation2011/data/overlays/HUD.oxo:8974-9015
/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/shipSelection/data/overlays/HUD.oxo:9038-9206
/code/branches/skybox2/data/overlays/HUD.oxo:6559-6989
/code/branches/sound/data/overlays/HUD.oxo:2829-3010
/code/branches/sound2012/data/overlays/HUD.oxo:9205-9240
/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/spacegate/data/overlays/HUD.oxo:9030-9215
/code/branches/spacerace/data/overlays/HUD.oxo:8182-8630
/code/branches/spaceraceTwo/data/overlays/HUD.oxo:8881-8996
/code/branches/steering/data/overlays/HUD.oxo:5949-6091,8140-8595
/code/branches/surfaceRace/data/overlays/HUD.oxo:9028-9199
/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/usability/data/overlays/HUD.oxo:7915-8078
/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/trunk/data/overlays/HUD.oxo:9189-9204
Property changes on: code/branches/presentation2012/data/overlays/HUDTemplates3.oxo
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/overlays/HUDTemplates3.oxo:8196-8560
/code/branches/dynamicmatch/data/overlays/HUDTemplates3.oxo:6584-7030
/code/branches/environment3/data/overlays/HUDTemplates3.oxo:8887-8975
/code/branches/formation/data/overlays/HUDTemplates3.oxo:8885-8991
/code/branches/fps/data/overlays/HUDTemplates3.oxo:6591-7072
/code/branches/gamecontent/data/overlays/HUDTemplates3.oxo:8893-8968
/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/hud/data/overlays/HUDTemplates3.oxo:8883-8986
/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/masterserverfix/data/overlays/HUDTemplates3.oxo:8933-8936
/code/branches/menu/data/overlays/HUDTemplates3.oxo:5941-6146,6148,7536-7687
/code/branches/menue/data/overlays/HUDTemplates3.oxo:8884-8976
/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/newlevel2012/data/overlays/HUDTemplates3.oxo:9033-9240
/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/output/data/overlays/HUDTemplates3.oxo:8739-8857
/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/pickup2012/data/overlays/HUDTemplates3.oxo:9029-9189
/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/presentation/data/overlays/HUDTemplates3.oxo:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/overlays/HUDTemplates3.oxo:6106-6416,7787-7800
/code/branches/presentation2011/data/overlays/HUDTemplates3.oxo:8974-9015
/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/shipSelection/data/overlays/HUDTemplates3.oxo:9038-9206
/code/branches/skybox2/data/overlays/HUDTemplates3.oxo:6559-6989
/code/branches/sound/data/overlays/HUDTemplates3.oxo:2829-3010
/code/branches/sound2012/data/overlays/HUDTemplates3.oxo:9205-9240
/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/spacegate/data/overlays/HUDTemplates3.oxo:9030-9215
/code/branches/spacerace/data/overlays/HUDTemplates3.oxo:8182-8630
/code/branches/spaceraceTwo/data/overlays/HUDTemplates3.oxo:8881-8996
/code/branches/steering/data/overlays/HUDTemplates3.oxo:5949-6091,8140-8595
/code/branches/surfaceRace/data/overlays/HUDTemplates3.oxo:9028-9199
/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/usability/data/overlays/HUDTemplates3.oxo:7915-8078
/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/trunk/data/overlays/HUDTemplates3.oxo:9189-9204
Property changes on: code/branches/presentation2012/data/overlays/HUDTemplatesFPS.oxo
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/overlays/HUDTemplatesFPS.oxo:8196-8560
/code/branches/dynamicmatch/data/overlays/HUDTemplatesFPS.oxo:6584-7030
/code/branches/environment3/data/overlays/HUDTemplatesFPS.oxo:8887-8975
/code/branches/formation/data/overlays/HUDTemplatesFPS.oxo:8885-8991
/code/branches/fps/data/overlays/HUDTemplatesFPS.oxo:6591-7072
/code/branches/gamecontent/data/overlays/HUDTemplatesFPS.oxo:8893-8968
/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/hud/data/overlays/HUDTemplatesFPS.oxo:8883-8986
/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/masterserverfix/data/overlays/HUDTemplatesFPS.oxo:8933-8936
/code/branches/menu/data/overlays/HUDTemplatesFPS.oxo:5941-6146,6148,7536-7687
/code/branches/menue/data/overlays/HUDTemplatesFPS.oxo:8884-8976
/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/newlevel2012/data/overlays/HUDTemplatesFPS.oxo:9033-9240
/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/output/data/overlays/HUDTemplatesFPS.oxo:8739-8857
/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/pickup2012/data/overlays/HUDTemplatesFPS.oxo:9029-9189
/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/presentation/data/overlays/HUDTemplatesFPS.oxo:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/overlays/HUDTemplatesFPS.oxo:6106-6416,7787-7800
/code/branches/presentation2011/data/overlays/HUDTemplatesFPS.oxo:8974-9015
/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/shipSelection/data/overlays/HUDTemplatesFPS.oxo:9038-9206
/code/branches/skybox2/data/overlays/HUDTemplatesFPS.oxo:6559-6989
/code/branches/sound/data/overlays/HUDTemplatesFPS.oxo:2829-3010
/code/branches/sound2012/data/overlays/HUDTemplatesFPS.oxo:9205-9240
/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/spacegate/data/overlays/HUDTemplatesFPS.oxo:9030-9215
/code/branches/spacerace/data/overlays/HUDTemplatesFPS.oxo:8182-8630
/code/branches/spaceraceTwo/data/overlays/HUDTemplatesFPS.oxo:8881-8996
/code/branches/steering/data/overlays/HUDTemplatesFPS.oxo:5949-6091,8140-8595
/code/branches/surfaceRace/data/overlays/HUDTemplatesFPS.oxo:9028-9199
/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/usability/data/overlays/HUDTemplatesFPS.oxo:7915-8078
/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/trunk/data/overlays/HUDTemplatesFPS.oxo:9189-9204
Property changes on: code/branches/presentation2012/data/overlays/debug.oxo
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/overlays/debug.oxo:8196-8560
/code/branches/dynamicmatch/data/overlays/debug.oxo:6584-7030
/code/branches/environment3/data/overlays/debug.oxo:8887-8975
/code/branches/formation/data/overlays/debug.oxo:8885-8991
/code/branches/fps/data/overlays/debug.oxo:6591-7072
/code/branches/gamecontent/data/overlays/debug.oxo:8893-8968
/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/hud/data/overlays/debug.oxo:8883-8986
/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/masterserverfix/data/overlays/debug.oxo:8933-8936
/code/branches/menu/data/overlays/debug.oxo:5941-6146,6148,7536-7687
/code/branches/menue/data/overlays/debug.oxo:8884-8976
/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/newlevel2012/data/overlays/debug.oxo:9033-9240
/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/output/data/overlays/debug.oxo:8739-8857
/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/pickup2012/data/overlays/debug.oxo:9029-9189
/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/presentation/data/overlays/debug.oxo:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/overlays/debug.oxo:6106-6416,7787-7800
/code/branches/presentation2011/data/overlays/debug.oxo:8974-9015
/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/shipSelection/data/overlays/debug.oxo:9038-9206
/code/branches/skybox2/data/overlays/debug.oxo:6559-6989
/code/branches/sound/data/overlays/debug.oxo:2829-3010
/code/branches/sound2012/data/overlays/debug.oxo:9205-9240
/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/spacegate/data/overlays/debug.oxo:9030-9215
/code/branches/spacerace/data/overlays/debug.oxo:8182-8630
/code/branches/spaceraceTwo/data/overlays/debug.oxo:8881-8996
/code/branches/steering/data/overlays/debug.oxo:5949-6091,8140-8595
/code/branches/surfaceRace/data/overlays/debug.oxo:9028-9199
/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/usability/data/overlays/debug.oxo:7915-8078
/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/trunk/data/overlays/debug.oxo:9189-9204
Property changes on: code/branches/presentation2012/data/overlays/dynamicMatchHUD.oxo
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/overlays/dynamicMatchHUD.oxo:8196-8560
/code/branches/dynamicmatch/data/overlays/dynamicMatchHUD.oxo:6584-7030
/code/branches/environment3/data/overlays/dynamicMatchHUD.oxo:8887-8975
/code/branches/formation/data/overlays/dynamicMatchHUD.oxo:8885-8991
/code/branches/fps/data/overlays/dynamicMatchHUD.oxo:6591-7072
/code/branches/gamecontent/data/overlays/dynamicMatchHUD.oxo:8893-8968
/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/hud/data/overlays/dynamicMatchHUD.oxo:8883-8986
/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/masterserverfix/data/overlays/dynamicMatchHUD.oxo:8933-8936
/code/branches/menu/data/overlays/dynamicMatchHUD.oxo:5941-6146,6148,7536-7687
/code/branches/menue/data/overlays/dynamicMatchHUD.oxo:8884-8976
/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/newlevel2012/data/overlays/dynamicMatchHUD.oxo:9033-9240
/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/output/data/overlays/dynamicMatchHUD.oxo:8739-8857
/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/pickup2012/data/overlays/dynamicMatchHUD.oxo:9029-9189
/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/presentation/data/overlays/dynamicMatchHUD.oxo:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/overlays/dynamicMatchHUD.oxo:6106-6416,7787-7800
/code/branches/presentation2011/data/overlays/dynamicMatchHUD.oxo:8974-9015
/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/shipSelection/data/overlays/dynamicMatchHUD.oxo:9038-9206
/code/branches/skybox2/data/overlays/dynamicMatchHUD.oxo:6559-6989
/code/branches/sound/data/overlays/dynamicMatchHUD.oxo:2829-3010
/code/branches/sound2012/data/overlays/dynamicMatchHUD.oxo:9205-9240
/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/spacegate/data/overlays/dynamicMatchHUD.oxo:9030-9215
/code/branches/spacerace/data/overlays/dynamicMatchHUD.oxo:8182-8630
/code/branches/spaceraceTwo/data/overlays/dynamicMatchHUD.oxo:8881-8996
/code/branches/steering/data/overlays/dynamicMatchHUD.oxo:5949-6091,8140-8595
/code/branches/surfaceRace/data/overlays/dynamicMatchHUD.oxo:9028-9199
/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/usability/data/overlays/dynamicMatchHUD.oxo:7915-8078
/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/trunk/data/overlays/dynamicMatchHUD.oxo:9189-9204
Property changes on: code/branches/presentation2012/data/overlays/lastManStandingHUD.oxo
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/overlays/lastManStandingHUD.oxo:8196-8560
/code/branches/dynamicmatch/data/overlays/lastManStandingHUD.oxo:6584-7030
/code/branches/environment3/data/overlays/lastManStandingHUD.oxo:8887-8975
/code/branches/formation/data/overlays/lastManStandingHUD.oxo:8885-8991
/code/branches/fps/data/overlays/lastManStandingHUD.oxo:6591-7072
/code/branches/gamecontent/data/overlays/lastManStandingHUD.oxo:8893-8968
/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/hud/data/overlays/lastManStandingHUD.oxo:8883-8986
/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/masterserverfix/data/overlays/lastManStandingHUD.oxo:8933-8936
/code/branches/menu/data/overlays/lastManStandingHUD.oxo:5941-6146,6148,7536-7687
/code/branches/menue/data/overlays/lastManStandingHUD.oxo:8884-8976
/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/newlevel2012/data/overlays/lastManStandingHUD.oxo:9033-9240
/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/output/data/overlays/lastManStandingHUD.oxo:8739-8857
/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/pickup2012/data/overlays/lastManStandingHUD.oxo:9029-9189
/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/presentation/data/overlays/lastManStandingHUD.oxo:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/overlays/lastManStandingHUD.oxo:6106-6416,7787-7800
/code/branches/presentation2011/data/overlays/lastManStandingHUD.oxo:8974-9015
/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/shipSelection/data/overlays/lastManStandingHUD.oxo:9038-9206
/code/branches/skybox2/data/overlays/lastManStandingHUD.oxo:6559-6989
/code/branches/sound/data/overlays/lastManStandingHUD.oxo:2829-3010
/code/branches/sound2012/data/overlays/lastManStandingHUD.oxo:9205-9240
/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/spacegate/data/overlays/lastManStandingHUD.oxo:9030-9215
/code/branches/spacerace/data/overlays/lastManStandingHUD.oxo:8182-8630
/code/branches/spaceraceTwo/data/overlays/lastManStandingHUD.oxo:8881-8996
/code/branches/steering/data/overlays/lastManStandingHUD.oxo:5949-6091,8140-8595
/code/branches/surfaceRace/data/overlays/lastManStandingHUD.oxo:9028-9199
/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/usability/data/overlays/lastManStandingHUD.oxo:7915-8078
/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/trunk/data/overlays/lastManStandingHUD.oxo:9189-9204
Property changes on: code/branches/presentation2012/data/overlays/lastTeamStandingHUD.oxo
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/overlays/lastTeamStandingHUD.oxo:8196-8560
/code/branches/dynamicmatch/data/overlays/lastTeamStandingHUD.oxo:6584-7030
/code/branches/environment3/data/overlays/lastTeamStandingHUD.oxo:8887-8975
/code/branches/formation/data/overlays/lastTeamStandingHUD.oxo:8885-8991
/code/branches/fps/data/overlays/lastTeamStandingHUD.oxo:6591-7072
/code/branches/gamecontent/data/overlays/lastTeamStandingHUD.oxo:8893-8968
/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/hud/data/overlays/lastTeamStandingHUD.oxo:8883-8986
/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/masterserverfix/data/overlays/lastTeamStandingHUD.oxo:8933-8936
/code/branches/menu/data/overlays/lastTeamStandingHUD.oxo:5941-6146,6148,7536-7687
/code/branches/menue/data/overlays/lastTeamStandingHUD.oxo:8884-8976
/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/newlevel2012/data/overlays/lastTeamStandingHUD.oxo:9033-9240
/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/output/data/overlays/lastTeamStandingHUD.oxo:8739-8857
/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/pickup2012/data/overlays/lastTeamStandingHUD.oxo:9029-9189
/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/presentation/data/overlays/lastTeamStandingHUD.oxo:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/overlays/lastTeamStandingHUD.oxo:6106-6416,7787-7800
/code/branches/presentation2011/data/overlays/lastTeamStandingHUD.oxo:8974-9015
/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/shipSelection/data/overlays/lastTeamStandingHUD.oxo:9038-9206
/code/branches/skybox2/data/overlays/lastTeamStandingHUD.oxo:6559-6989
/code/branches/sound/data/overlays/lastTeamStandingHUD.oxo:2829-3010
/code/branches/sound2012/data/overlays/lastTeamStandingHUD.oxo:9205-9240
/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/spacegate/data/overlays/lastTeamStandingHUD.oxo:9030-9215
/code/branches/spacerace/data/overlays/lastTeamStandingHUD.oxo:8182-8630
/code/branches/spaceraceTwo/data/overlays/lastTeamStandingHUD.oxo:8881-8996
/code/branches/steering/data/overlays/lastTeamStandingHUD.oxo:5949-6091,8140-8595
/code/branches/surfaceRace/data/overlays/lastTeamStandingHUD.oxo:9028-9199
/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/trunk/data/overlays/lastTeamStandingHUD.oxo:9189-9204
Property changes on: code/branches/presentation2012/data/overlays/pongHUD.oxo
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/overlays/pongHUD.oxo:8196-8560
/code/branches/dynamicmatch/data/overlays/pongHUD.oxo:6584-7030
/code/branches/environment3/data/overlays/pongHUD.oxo:8887-8975
/code/branches/formation/data/overlays/pongHUD.oxo:8885-8991
/code/branches/fps/data/overlays/pongHUD.oxo:6591-7072
/code/branches/gamecontent/data/overlays/pongHUD.oxo:8893-8968
/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/hud/data/overlays/pongHUD.oxo:8883-8986
/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/masterserverfix/data/overlays/pongHUD.oxo:8933-8936
/code/branches/menu/data/overlays/pongHUD.oxo:5941-6146,6148,7536-7687
/code/branches/menue/data/overlays/pongHUD.oxo:8884-8976
/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/newlevel2012/data/overlays/pongHUD.oxo:9033-9240
/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/output/data/overlays/pongHUD.oxo:8739-8857
/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/pickup2012/data/overlays/pongHUD.oxo:9029-9189
/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/presentation/data/overlays/pongHUD.oxo:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/overlays/pongHUD.oxo:6106-6416,7787-7800
/code/branches/presentation2011/data/overlays/pongHUD.oxo:8974-9015
/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/shipSelection/data/overlays/pongHUD.oxo:9038-9206
/code/branches/skybox2/data/overlays/pongHUD.oxo:6559-6989
/code/branches/sound/data/overlays/pongHUD.oxo:2829-3010
/code/branches/sound2012/data/overlays/pongHUD.oxo:9205-9240
/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/spacegate/data/overlays/pongHUD.oxo:9030-9215
/code/branches/spacerace/data/overlays/pongHUD.oxo:8182-8630
/code/branches/spaceraceTwo/data/overlays/pongHUD.oxo:8881-8996
/code/branches/steering/data/overlays/pongHUD.oxo:5949-6091,8140-8595
/code/branches/surfaceRace/data/overlays/pongHUD.oxo:9028-9199
/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/usability/data/overlays/pongHUD.oxo:7915-8078
/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/trunk/data/overlays/pongHUD.oxo:9189-9204
Property changes on: code/branches/presentation2012/data/overlays/stats.oxo
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/overlays/stats.oxo:8196-8560
/code/branches/dynamicmatch/data/overlays/stats.oxo:6584-7030
/code/branches/environment3/data/overlays/stats.oxo:8887-8975
/code/branches/formation/data/overlays/stats.oxo:8885-8991
/code/branches/fps/data/overlays/stats.oxo:6591-7072
/code/branches/gamecontent/data/overlays/stats.oxo:8893-8968
/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/hud/data/overlays/stats.oxo:8883-8986
/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/masterserverfix/data/overlays/stats.oxo:8933-8936
/code/branches/menu/data/overlays/stats.oxo:5941-6146,6148,7536-7687
/code/branches/menue/data/overlays/stats.oxo:8884-8976
/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/newlevel2012/data/overlays/stats.oxo:9033-9240
/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/output/data/overlays/stats.oxo:8739-8857
/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/pickup2012/data/overlays/stats.oxo:9029-9189
/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/presentation/data/overlays/stats.oxo:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/overlays/stats.oxo:6106-6416,7787-7800
/code/branches/presentation2011/data/overlays/stats.oxo:8974-9015
/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/shipSelection/data/overlays/stats.oxo:9038-9206
/code/branches/skybox2/data/overlays/stats.oxo:6559-6989
/code/branches/sound/data/overlays/stats.oxo:2829-3010
/code/branches/sound2012/data/overlays/stats.oxo:9205-9240
/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/spacegate/data/overlays/stats.oxo:9030-9215
/code/branches/spacerace/data/overlays/stats.oxo:8182-8630
/code/branches/spaceraceTwo/data/overlays/stats.oxo:8881-8996
/code/branches/steering/data/overlays/stats.oxo:5949-6091,8140-8595
/code/branches/surfaceRace/data/overlays/stats.oxo:9028-9199
/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/usability/data/overlays/stats.oxo:7915-8078
/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/trunk/data/overlays/stats.oxo:9189-9204
Property changes on: code/branches/presentation2012/data/overlays/teamBaseMatchHUD.oxo
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/overlays/teamBaseMatchHUD.oxo:8196-8560
/code/branches/dynamicmatch/data/overlays/teamBaseMatchHUD.oxo:6584-7030
/code/branches/environment3/data/overlays/teamBaseMatchHUD.oxo:8887-8975
/code/branches/formation/data/overlays/teamBaseMatchHUD.oxo:8885-8991
/code/branches/fps/data/overlays/teamBaseMatchHUD.oxo:6591-7072
/code/branches/gamecontent/data/overlays/teamBaseMatchHUD.oxo:8893-8968
/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/hud/data/overlays/teamBaseMatchHUD.oxo:8883-8986
/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/masterserverfix/data/overlays/teamBaseMatchHUD.oxo:8933-8936
/code/branches/menu/data/overlays/teamBaseMatchHUD.oxo:5941-6146,6148,7536-7687
/code/branches/menue/data/overlays/teamBaseMatchHUD.oxo:8884-8976
/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/newlevel2012/data/overlays/teamBaseMatchHUD.oxo:9033-9240
/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/output/data/overlays/teamBaseMatchHUD.oxo:8739-8857
/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/pickup2012/data/overlays/teamBaseMatchHUD.oxo:9029-9189
/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/presentation/data/overlays/teamBaseMatchHUD.oxo:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/overlays/teamBaseMatchHUD.oxo:6106-6416,7787-7800
/code/branches/presentation2011/data/overlays/teamBaseMatchHUD.oxo:8974-9015
/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/shipSelection/data/overlays/teamBaseMatchHUD.oxo:9038-9206
/code/branches/skybox2/data/overlays/teamBaseMatchHUD.oxo:6559-6989
/code/branches/sound/data/overlays/teamBaseMatchHUD.oxo:2829-3010
/code/branches/sound2012/data/overlays/teamBaseMatchHUD.oxo:9205-9240
/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/spacegate/data/overlays/teamBaseMatchHUD.oxo:9030-9215
/code/branches/spacerace/data/overlays/teamBaseMatchHUD.oxo:8182-8630
/code/branches/spaceraceTwo/data/overlays/teamBaseMatchHUD.oxo:8881-8996
/code/branches/steering/data/overlays/teamBaseMatchHUD.oxo:5949-6091,8140-8595
/code/branches/surfaceRace/data/overlays/teamBaseMatchHUD.oxo:9028-9199
/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/usability/data/overlays/teamBaseMatchHUD.oxo:7915-8078
/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/trunk/data/overlays/teamBaseMatchHUD.oxo:9189-9204
Property changes on: code/branches/presentation2012/data/overlays/underAttackHUD.oxo
___________________________________________________________________
Deleted: svn:mergeinfo
- /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/dockingsystem2/data/overlays/underAttackHUD.oxo:8196-8560
/code/branches/dynamicmatch/data/overlays/underAttackHUD.oxo:6584-7030
/code/branches/environment3/data/overlays/underAttackHUD.oxo:8887-8975
/code/branches/formation/data/overlays/underAttackHUD.oxo:8885-8991
/code/branches/fps/data/overlays/underAttackHUD.oxo:6591-7072
/code/branches/gamecontent/data/overlays/underAttackHUD.oxo:8893-8968
/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/hud/data/overlays/underAttackHUD.oxo:8883-8986
/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/masterserverfix/data/overlays/underAttackHUD.oxo:8933-8936
/code/branches/menu/data/overlays/underAttackHUD.oxo:5941-6146,6148,7536-7687
/code/branches/menue/data/overlays/underAttackHUD.oxo:8884-8976
/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/newlevel2012/data/overlays/underAttackHUD.oxo:9033-9240
/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/output/data/overlays/underAttackHUD.oxo:8739-8857
/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/pickup2012/data/overlays/underAttackHUD.oxo:9029-9189
/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/presentation/data/overlays/underAttackHUD.oxo:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/data/overlays/underAttackHUD.oxo:6106-6416,7787-7800
/code/branches/presentation2011/data/overlays/underAttackHUD.oxo:8974-9015
/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/shipSelection/data/overlays/underAttackHUD.oxo:9038-9206
/code/branches/skybox2/data/overlays/underAttackHUD.oxo:6559-6989
/code/branches/sound/data/overlays/underAttackHUD.oxo:2829-3010
/code/branches/sound2012/data/overlays/underAttackHUD.oxo:9205-9240
/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/spacegate/data/overlays/underAttackHUD.oxo:9030-9215
/code/branches/spacerace/data/overlays/underAttackHUD.oxo:8182-8630
/code/branches/spaceraceTwo/data/overlays/underAttackHUD.oxo:8881-8996
/code/branches/steering/data/overlays/underAttackHUD.oxo:5949-6091,8140-8595
/code/branches/surfaceRace/data/overlays/underAttackHUD.oxo:9028-9199
/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/usability/data/overlays/underAttackHUD.oxo:7915-8078
/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
/code/trunk/data/overlays/underAttackHUD.oxo:9189-9204
Property changes on: code/branches/presentation2012/doc
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/doc:6592-7033
/code/branches/ai2/doc:8721-8880
/code/branches/bigships/doc:8137-8588
/code/branches/buildsystem/doc:1874-2276,2278-2400
/code/branches/buildsystem2/doc:2506-2658
/code/branches/buildsystem3/doc:2662-2708
/code/branches/ceguilua/doc:1802-1808
/code/branches/chat/doc:6527-6797
/code/branches/chat2/doc:6836-6910
/code/branches/console/doc:5941-6104
/code/branches/consolecommands2/doc:6451-7178
/code/branches/consolecommands3/doc:7178-7283
/code/branches/core3/doc:1572-1739
/code/branches/core4/doc: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/doc:5768-5928,6009
/code/branches/data_cleanup/doc:7537-7686
/code/branches/doc/doc:7290-7400
/code/branches/dockingsystem/doc:8101-8192
/code/branches/dockingsystem2/doc:8196-8560
/code/branches/dynamicmatch/doc:6584-7030
/code/branches/environment3/doc:8887-8975
/code/branches/formation/doc:8885-8991
/code/branches/fps/doc:6591-7072
/code/branches/gamecontent/doc:8893-8968
/code/branches/gameimmersion/doc:8102-8577
/code/branches/gamestate/doc:6430-6572,6621-6661
/code/branches/gamestates2/doc:6594-6745
/code/branches/gametypes/doc:2826-3031
/code/branches/gcc43/doc:1580
/code/branches/gui/doc:1635-1723,2795-2894
/code/branches/hud/doc:8883-8986
/code/branches/hudelements/doc:6584-6941
/code/branches/hudimprovements/doc:7920-8672
/code/branches/ingamemenu/doc:6000-6023
/code/branches/input/doc:1629-1636
/code/branches/ipv6/doc:7293-7458
/code/branches/kicklib/doc:7940-8096,8098-8277
/code/branches/kicklib2/doc:8282-8350
/code/branches/lastmanstanding/doc:7479-7644
/code/branches/lastmanstanding3/doc:7903-8175
/code/branches/libraries/doc:5612-5692
/code/branches/libraries2/doc:5703-5737
/code/branches/lod/doc:6586-6911
/code/branches/lodfinal/doc:2372-2411
/code/branches/mac_osx/doc:7789-8128,8135
/code/branches/map/doc:2801-3086,3089
/code/branches/masterserver/doc:7502-7738
/code/branches/masterserverfix/doc:8933-8936
/code/branches/menu/doc:5941-6146,6148,7536-7687
/code/branches/menue/doc:8884-8976
/code/branches/miniprojects/doc:2754-2824
/code/branches/netp2/doc:2835-2988
/code/branches/netp3/doc:2988-3082
/code/branches/netp6/doc:3214-3302
/code/branches/network/doc:2356
/code/branches/network2/doc:6434-6465
/code/branches/network3/doc:7196-7344
/code/branches/network4/doc:7497-7755
/code/branches/network5/doc:7757-7781
/code/branches/network6/doc:7823-8315
/code/branches/network64/doc:2210-2355
/code/branches/newlevel2012/doc:9033-9240
/code/branches/notifications/doc:7314-7401
/code/branches/objecthierarchy/doc:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/doc:2171-2479
/code/branches/ois_update/doc:7506-7788
/code/branches/output/doc:8739-8857
/code/branches/overlay/doc:2117-2385
/code/branches/particles/doc:2829-3085
/code/branches/particles2/doc:6050-6106,6109
/code/branches/pch/doc:3113-3194
/code/branches/physics/doc:1912-2055,2107-2439
/code/branches/physics_merge/doc:2436-2457
/code/branches/pickup/doc:8145-8555
/code/branches/pickup2/doc:5942-6405
/code/branches/pickup2012/doc:9029-9189
/code/branches/pickup3/doc:6418-6523
/code/branches/pickup4/doc:6594-6710
/code/branches/pickups/doc:1926-2086,2127,2827-2915
/code/branches/pickups2/doc:2107-2497,2915-3071
/code/branches/png2/doc:7262-7263
/code/branches/portals/doc:8087-8455
/code/branches/portals2/doc:8460-8602
/code/branches/ppspickups1/doc:6552-6708
/code/branches/ppspickups2/doc:6527-6532,6554-6709
/code/branches/ppspickups3/doc:6757-6997
/code/branches/ppspickups4/doc:7003-7089
/code/branches/presentation/doc:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/doc:6106-6416,7787-7800
/code/branches/presentation2011/doc:8974-9015
/code/branches/presentation3/doc:6913-7162
/code/branches/questsystem/doc:1894-2088
/code/branches/questsystem2/doc:2107-2259
/code/branches/questsystem5/doc:2776-2905
/code/branches/releasetodo/doc:7614-7647
/code/branches/resource/doc:3327-3366
/code/branches/resource2/doc:3372-5694
/code/branches/rocket/doc:6523-6950
/code/branches/rocket2/doc:6953-6970
/code/branches/script_trigger/doc:1295-1953,1955
/code/branches/shipSelection/doc:9038-9206
/code/branches/skybox2/doc:6559-6989
/code/branches/sound/doc:2829-3010
/code/branches/sound2012/doc:9205-9240
/code/branches/sound3/doc:5941-6102
/code/branches/spaceboundaries/doc:8085-8457
/code/branches/spaceboundaries2/doc:8460-8613
/code/branches/spacegate/doc:9030-9215
/code/branches/spacerace/doc:8182-8630
/code/branches/spaceraceTwo/doc:8881-8996
/code/branches/steering/doc:5949-6091,8140-8595
/code/branches/surfaceRace/doc:9028-9199
/code/branches/tetris/doc:8100-8563
/code/branches/tutoriallevel/doc:7827-8370
/code/branches/tutoriallevel2/doc:8370-8452
/code/branches/tutoriallevel3/doc:8453-8636
/code/branches/unity_build/doc:8440-8716
/code/branches/usability/doc:7915-8078
/code/branches/weapon/doc:1925-2094
/code/branches/weapon2/doc:2107-2488
/code/branches/weapons/doc:2897-3051,8143-8591
/code/branches/weaponsystem/doc:2742-2890
/code/trunk/doc:9189-9204
Property changes on: code/branches/presentation2012/src
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src:6592-7033
/code/branches/ai2/src:8721-8880
/code/branches/bigships/src:8137-8588
/code/branches/buildsystem/src:1874-2276,2278-2400
/code/branches/buildsystem2/src:2506-2658
/code/branches/buildsystem3/src:2662-2708
/code/branches/ceguilua/src:1802-1808
/code/branches/chat/src:6527-6797
/code/branches/chat2/src:6836-6910
/code/branches/console/src:5941-6104
/code/branches/consolecommands2/src:6451-7178
/code/branches/consolecommands3/src:7178-7283
/code/branches/core3/src:1572-1739
/code/branches/core4/src: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/src:5768-5928,6009
/code/branches/data_cleanup/src:7537-7686
/code/branches/doc/src:7290-7400
/code/branches/dockingsystem/src:8101-8192
/code/branches/dockingsystem2/src:8196-8560
/code/branches/dynamicmatch/src:6584-7030
/code/branches/environment3/src:8887-8975
/code/branches/formation/src:8885-8991
/code/branches/fps/src:6591-7072
/code/branches/gamecontent/src:8893-8968
/code/branches/gameimmersion/src:8102-8577
/code/branches/gamestate/src:6430-6572,6621-6661
/code/branches/gamestates2/src:6594-6745
/code/branches/gametypes/src:2826-3031
/code/branches/gcc43/src:1580
/code/branches/gui/src:1635-1723,2795-2894
/code/branches/hud/src:8883-8986
/code/branches/hudelements/src:6584-6941
/code/branches/hudimprovements/src:7920-8672
/code/branches/ingamemenu/src:6000-6023
/code/branches/input/src:1629-1636
/code/branches/ipv6/src:7293-7458
/code/branches/kicklib/src:7940-8096,8098-8277
/code/branches/kicklib2/src:8282-8350
/code/branches/lastmanstanding/src:7479-7644
/code/branches/lastmanstanding3/src:7903-8175
/code/branches/libraries/src:5612-5692
/code/branches/libraries2/src:5703-5737
/code/branches/lod/src:6586-6911
/code/branches/lodfinal/src:2372-2411
/code/branches/mac_osx/src:7789-8128,8135
/code/branches/map/src:2801-3086,3089
/code/branches/masterserver/src:7502-7738
/code/branches/masterserverfix/src:8933-8936
/code/branches/menu/src:5941-6146,6148,7536-7687
/code/branches/menue/src:8884-8976
/code/branches/miniprojects/src:2754-2824
/code/branches/netp2/src:2835-2988
/code/branches/netp3/src:2988-3082
/code/branches/netp6/src:3214-3302
/code/branches/network/src:2356
/code/branches/network2/src:6434-6465
/code/branches/network3/src:7196-7344
/code/branches/network4/src:7497-7755
/code/branches/network5/src:7757-7781
/code/branches/network6/src:7823-8315
/code/branches/network64/src:2210-2355
/code/branches/newlevel2012/src:9033-9240
/code/branches/notifications/src:7314-7401
/code/branches/objecthierarchy/src:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src:2171-2479
/code/branches/ois_update/src:7506-7788
/code/branches/output/src:8739-8857
/code/branches/overlay/src:2117-2385
/code/branches/particles/src:2829-3085
/code/branches/particles2/src:6050-6106,6109
/code/branches/pch/src:3113-3194
/code/branches/physics/src:1912-2055,2107-2439
/code/branches/physics_merge/src:2436-2457
/code/branches/pickup/src:8145-8555
/code/branches/pickup2/src:5942-6405
/code/branches/pickup2012/src:9029-9189
/code/branches/pickup3/src:6418-6523
/code/branches/pickup4/src:6594-6710
/code/branches/pickups/src:1926-2086,2127,2827-2915
/code/branches/pickups2/src:2107-2497,2915-3071
/code/branches/png2/src:7262-7263
/code/branches/portals/src:8087-8455
/code/branches/portals2/src:8460-8602
/code/branches/ppspickups1/src:6552-6708
/code/branches/ppspickups2/src:6527-6532,6554-6709
/code/branches/ppspickups3/src:6757-6997
/code/branches/ppspickups4/src:7003-7089
/code/branches/presentation/src:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src:6106-6416,7787-7800
/code/branches/presentation2011/src:8974-9015
/code/branches/presentation3/src:6913-7162
/code/branches/questsystem/src:1894-2088
/code/branches/questsystem2/src:2107-2259
/code/branches/questsystem5/src:2776-2905
/code/branches/releasetodo/src:7614-7647
/code/branches/resource/src:3327-3366
/code/branches/resource2/src:3372-5694
/code/branches/rocket/src:6523-6950
/code/branches/rocket2/src:6953-6970
/code/branches/script_trigger/src:1295-1953,1955
/code/branches/shipSelection/src:9038-9206
/code/branches/skybox2/src:6559-6989
/code/branches/sound/src:2829-3010
/code/branches/sound2012/src:9205-9240
/code/branches/sound3/src:5941-6102
/code/branches/spaceboundaries/src:8085-8457
/code/branches/spaceboundaries2/src:8460-8613
/code/branches/spacegate/src:9030-9215
/code/branches/spacerace/src:8182-8630
/code/branches/spaceraceTwo/src:8881-8996
/code/branches/steering/src:5949-6091,8140-8595
/code/branches/surfaceRace/src:9028-9199
/code/branches/tetris/src:8100-8563
/code/branches/tutoriallevel/src:7827-8370
/code/branches/tutoriallevel2/src:8370-8452
/code/branches/tutoriallevel3/src:8453-8636
/code/branches/unity_build/src:8440-8716
/code/branches/usability/src:7915-8078
/code/branches/weapon/src:1925-2094
/code/branches/weapon2/src:2107-2488
/code/branches/weapons/src:2897-3051,8143-8591
/code/branches/weaponsystem/src:2742-2890
/code/trunk/src:9189-9204
Property changes on: code/branches/presentation2012/src/modules
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules:6592-7033
/code/branches/ai2/src/modules:8721-8880
/code/branches/bigships/src/modules:8137-8588
/code/branches/buildsystem/src/modules:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules:2506-2658
/code/branches/buildsystem3/src/modules:2662-2708
/code/branches/ceguilua/src/modules:1802-1808
/code/branches/chat/src/modules:6527-6797
/code/branches/chat2/src/modules:6836-6910
/code/branches/console/src/modules:5941-6104
/code/branches/consolecommands2/src/modules:6451-7178
/code/branches/consolecommands3/src/modules:7178-7283
/code/branches/core3/src/modules:1572-1739
/code/branches/core4/src/modules: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/src/modules:5768-5928,6009
/code/branches/data_cleanup/src/modules:7537-7686
/code/branches/doc/src/modules:7290-7400
/code/branches/dockingsystem/src/modules:8101-8192
/code/branches/dockingsystem2/src/modules:8196-8560
/code/branches/dynamicmatch/src/modules:6584-7030
/code/branches/environment3/src/modules:8887-8975
/code/branches/formation/src/modules:8885-8991
/code/branches/fps/src/modules:6591-7072
/code/branches/gamecontent/src/modules:8893-8968
/code/branches/gameimmersion/src/modules:8102-8577
/code/branches/gamestate/src/modules:6430-6572,6621-6661
/code/branches/gamestates2/src/modules:6594-6745
/code/branches/gametypes/src/modules:2826-3031
/code/branches/gcc43/src/modules:1580
/code/branches/gui/src/modules:1635-1723,2795-2894
/code/branches/hud/src/modules:8883-8986
/code/branches/hudelements/src/modules:6584-6941
/code/branches/hudimprovements/src/modules:7920-8672
/code/branches/ingamemenu/src/modules:6000-6023
/code/branches/input/src/modules:1629-1636
/code/branches/ipv6/src/modules:7293-7458
/code/branches/kicklib/src/modules:7940-8096,8098-8277
/code/branches/kicklib2/src/modules:8282-8350
/code/branches/lastmanstanding/src/modules:7479-7644
/code/branches/lastmanstanding3/src/modules:7903-8175
/code/branches/libraries/src/modules:5612-5692
/code/branches/libraries2/src/modules:5703-5737
/code/branches/lod/src/modules:6586-6911
/code/branches/lodfinal/src/modules:2372-2411
/code/branches/mac_osx/src/modules:7789-8128,8135
/code/branches/map/src/modules:2801-3086,3089
/code/branches/masterserver/src/modules:7502-7738
/code/branches/masterserverfix/src/modules:8933-8936
/code/branches/menu/src/modules:5941-6146,6148,7536-7687
/code/branches/menue/src/modules:8884-8976
/code/branches/miniprojects/src/modules:2754-2824
/code/branches/netp2/src/modules:2835-2988
/code/branches/netp3/src/modules:2988-3082
/code/branches/netp6/src/modules:3214-3302
/code/branches/network/src/modules:2356
/code/branches/network2/src/modules:6434-6465
/code/branches/network3/src/modules:7196-7344
/code/branches/network4/src/modules:7497-7755
/code/branches/network5/src/modules:7757-7781
/code/branches/network6/src/modules:7823-8315
/code/branches/network64/src/modules:2210-2355
/code/branches/newlevel2012/src/modules:9033-9240
/code/branches/notifications/src/modules:7314-7401
/code/branches/objecthierarchy/src/modules:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules:2171-2479
/code/branches/ois_update/src/modules:7506-7788
/code/branches/output/src/modules:8739-8857
/code/branches/overlay/src/modules:2117-2385
/code/branches/particles/src/modules:2829-3085
/code/branches/particles2/src/modules:6050-6106,6109
/code/branches/pch/src/modules:3113-3194
/code/branches/physics/src/modules:1912-2055,2107-2439
/code/branches/physics_merge/src/modules:2436-2457
/code/branches/pickup/src/modules:8145-8555
/code/branches/pickup2/src/modules:5942-6405
/code/branches/pickup2012/src/modules:9029-9189
/code/branches/pickup3/src/modules:6418-6523
/code/branches/pickup4/src/modules:6594-6710
/code/branches/pickups/src/modules:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules:2107-2497,2915-3071
/code/branches/png2/src/modules:7262-7263
/code/branches/portals/src/modules:8087-8455
/code/branches/portals2/src/modules:8460-8602
/code/branches/ppspickups1/src/modules:6552-6708
/code/branches/ppspickups2/src/modules:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules:6757-6997
/code/branches/ppspickups4/src/modules:7003-7089
/code/branches/presentation/src/modules:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules:6106-6416,7787-7800
/code/branches/presentation2011/src/modules:8974-9015
/code/branches/presentation3/src/modules:6913-7162
/code/branches/questsystem/src/modules:1894-2088
/code/branches/questsystem2/src/modules:2107-2259
/code/branches/questsystem5/src/modules:2776-2905
/code/branches/releasetodo/src/modules:7614-7647
/code/branches/resource/src/modules:3327-3366
/code/branches/resource2/src/modules:3372-5694
/code/branches/rocket/src/modules:6523-6950
/code/branches/rocket2/src/modules:6953-6970
/code/branches/script_trigger/src/modules:1295-1953,1955
/code/branches/shipSelection/src/modules:9038-9206
/code/branches/skybox2/src/modules:6559-6989
/code/branches/sound/src/modules:2829-3010
/code/branches/sound2012/src/modules:9205-9214,9215-9240*
/code/branches/sound3/src/modules:5941-6102
/code/branches/spaceboundaries/src/modules:8085-8457
/code/branches/spaceboundaries2/src/modules:8460-8613
/code/branches/spacegate/src/modules:9030-9215
/code/branches/spacerace/src/modules:8182-8630
/code/branches/spaceraceTwo/src/modules:8881-8996
/code/branches/steering/src/modules:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules:9028-9199
/code/branches/tetris/src/modules:8100-8563
/code/branches/tutoriallevel/src/modules:7827-8370
/code/branches/tutoriallevel2/src/modules:8370-8452
/code/branches/tutoriallevel3/src/modules:8453-8636
/code/branches/unity_build/src/modules:8440-8716
/code/branches/usability/src/modules:7915-8078
/code/branches/weapon/src/modules:1925-2094
/code/branches/weapon2/src/modules:2107-2488
/code/branches/weapons/src/modules:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules:2742-2890
/code/trunk/src/modules:9189-9204
Property changes on: code/branches/presentation2012/src/modules/CMakeLists.txt
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/CMakeLists.txt:6592-7033
/code/branches/ai2/src/modules/CMakeLists.txt:8721-8880
/code/branches/bigships/src/modules/CMakeLists.txt:8137-8588
/code/branches/buildsystem/src/modules/CMakeLists.txt:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/CMakeLists.txt:2506-2658
/code/branches/buildsystem3/src/modules/CMakeLists.txt:2662-2708
/code/branches/ceguilua/src/modules/CMakeLists.txt:1802-1808
/code/branches/chat/src/modules/CMakeLists.txt:6527-6797
/code/branches/chat2/src/modules/CMakeLists.txt:6836-6910
/code/branches/console/src/modules/CMakeLists.txt:5941-6104
/code/branches/consolecommands2/src/modules/CMakeLists.txt:6451-7178
/code/branches/consolecommands3/src/modules/CMakeLists.txt:7178-7283
/code/branches/core3/src/modules/CMakeLists.txt:1572-1739
/code/branches/core4/src/modules/CMakeLists.txt: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/src/modules/CMakeLists.txt:5768-5928,6009
/code/branches/data_cleanup/src/modules/CMakeLists.txt:7537-7686
/code/branches/doc/src/modules/CMakeLists.txt:7290-7400
/code/branches/dockingsystem/src/modules/CMakeLists.txt:8101-8192
/code/branches/dockingsystem2/src/modules/CMakeLists.txt:8196-8560
/code/branches/dynamicmatch/src/modules/CMakeLists.txt:6584-7030
/code/branches/environment3/src/modules/CMakeLists.txt:8887-8975
/code/branches/formation/src/modules/CMakeLists.txt:8885-8991
/code/branches/fps/src/modules/CMakeLists.txt:6591-7072
/code/branches/gamecontent/src/modules/CMakeLists.txt:8893-8968
/code/branches/gameimmersion/src/modules/CMakeLists.txt:8102-8577
/code/branches/gamestate/src/modules/CMakeLists.txt:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/CMakeLists.txt:6594-6745
/code/branches/gametypes/src/modules/CMakeLists.txt:2826-3031
/code/branches/gcc43/src/modules/CMakeLists.txt:1580
/code/branches/gui/src/modules/CMakeLists.txt:1635-1723,2795-2894
/code/branches/hud/src/modules/CMakeLists.txt:8883-8986
/code/branches/hudelements/src/modules/CMakeLists.txt:6584-6941
/code/branches/hudimprovements/src/modules/CMakeLists.txt:7920-8672
/code/branches/ingamemenu/src/modules/CMakeLists.txt:6000-6023
/code/branches/input/src/modules/CMakeLists.txt:1629-1636
/code/branches/ipv6/src/modules/CMakeLists.txt:7293-7458
/code/branches/kicklib/src/modules/CMakeLists.txt:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/CMakeLists.txt:8282-8350
/code/branches/lastmanstanding/src/modules/CMakeLists.txt:7479-7644
/code/branches/lastmanstanding3/src/modules/CMakeLists.txt:7903-8175
/code/branches/libraries/src/modules/CMakeLists.txt:5612-5692
/code/branches/libraries2/src/modules/CMakeLists.txt:5703-5737
/code/branches/lod/src/modules/CMakeLists.txt:6586-6911
/code/branches/lodfinal/src/modules/CMakeLists.txt:2372-2411
/code/branches/mac_osx/src/modules/CMakeLists.txt:7789-8128,8135
/code/branches/map/src/modules/CMakeLists.txt:2801-3086,3089
/code/branches/masterserver/src/modules/CMakeLists.txt:7502-7738
/code/branches/masterserverfix/src/modules/CMakeLists.txt:8933-8936
/code/branches/menu/src/modules/CMakeLists.txt:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/CMakeLists.txt:8884-8976
/code/branches/miniprojects/src/modules/CMakeLists.txt:2754-2824
/code/branches/netp2/src/modules/CMakeLists.txt:2835-2988
/code/branches/netp3/src/modules/CMakeLists.txt:2988-3082
/code/branches/netp6/src/modules/CMakeLists.txt:3214-3302
/code/branches/network/src/modules/CMakeLists.txt:2356
/code/branches/network2/src/modules/CMakeLists.txt:6434-6465
/code/branches/network3/src/modules/CMakeLists.txt:7196-7344
/code/branches/network4/src/modules/CMakeLists.txt:7497-7755
/code/branches/network5/src/modules/CMakeLists.txt:7757-7781
/code/branches/network6/src/modules/CMakeLists.txt:7823-8315
/code/branches/network64/src/modules/CMakeLists.txt:2210-2355
/code/branches/newlevel2012/src/modules/CMakeLists.txt:9033-9240
/code/branches/notifications/src/modules/CMakeLists.txt:7314-7401
/code/branches/objecthierarchy/src/modules/CMakeLists.txt:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/CMakeLists.txt:2171-2479
/code/branches/ois_update/src/modules/CMakeLists.txt:7506-7788
/code/branches/output/src/modules/CMakeLists.txt:8739-8857
/code/branches/overlay/src/modules/CMakeLists.txt:2117-2385
/code/branches/particles/src/modules/CMakeLists.txt:2829-3085
/code/branches/particles2/src/modules/CMakeLists.txt:6050-6106,6109
/code/branches/pch/src/modules/CMakeLists.txt:3113-3194
/code/branches/physics/src/modules/CMakeLists.txt:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/CMakeLists.txt:2436-2457
/code/branches/pickup/src/modules/CMakeLists.txt:8145-8555
/code/branches/pickup2/src/modules/CMakeLists.txt:5942-6405
/code/branches/pickup2012/src/modules/CMakeLists.txt:9029-9189
/code/branches/pickup3/src/modules/CMakeLists.txt:6418-6523
/code/branches/pickup4/src/modules/CMakeLists.txt:6594-6710
/code/branches/pickups/src/modules/CMakeLists.txt:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/CMakeLists.txt:2107-2497,2915-3071
/code/branches/png2/src/modules/CMakeLists.txt:7262-7263
/code/branches/portals/src/modules/CMakeLists.txt:8087-8455
/code/branches/portals2/src/modules/CMakeLists.txt:8460-8602
/code/branches/ppspickups1/src/modules/CMakeLists.txt:6552-6708
/code/branches/ppspickups2/src/modules/CMakeLists.txt:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/CMakeLists.txt:6757-6997
/code/branches/ppspickups4/src/modules/CMakeLists.txt:7003-7089
/code/branches/presentation/src/modules/CMakeLists.txt:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/CMakeLists.txt:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/CMakeLists.txt:8974-9015
/code/branches/presentation3/src/modules/CMakeLists.txt:6913-7162
/code/branches/questsystem/src/modules/CMakeLists.txt:1894-2088
/code/branches/questsystem2/src/modules/CMakeLists.txt:2107-2259
/code/branches/questsystem5/src/modules/CMakeLists.txt:2776-2905
/code/branches/releasetodo/src/modules/CMakeLists.txt:7614-7647
/code/branches/resource/src/modules/CMakeLists.txt:3327-3366
/code/branches/resource2/src/modules/CMakeLists.txt:3372-5694
/code/branches/rocket/src/modules/CMakeLists.txt:6523-6950
/code/branches/rocket2/src/modules/CMakeLists.txt:6953-6970
/code/branches/script_trigger/src/modules/CMakeLists.txt:1295-1953,1955
/code/branches/shipSelection/src/modules/CMakeLists.txt:9038-9206
/code/branches/skybox2/src/modules/CMakeLists.txt:6559-6989
/code/branches/sound/src/modules/CMakeLists.txt:2829-3010
/code/branches/sound2012/src/modules/CMakeLists.txt:9205-9240
/code/branches/sound3/src/modules/CMakeLists.txt:5941-6102
/code/branches/spaceboundaries/src/modules/CMakeLists.txt:8085-8457
/code/branches/spaceboundaries2/src/modules/CMakeLists.txt:8460-8613
/code/branches/spacegate/src/modules/CMakeLists.txt:9030-9215
/code/branches/spacerace/src/modules/CMakeLists.txt:8182-8630
/code/branches/spaceraceTwo/src/modules/CMakeLists.txt:8881-8996
/code/branches/steering/src/modules/CMakeLists.txt:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/CMakeLists.txt:9028-9199
/code/branches/tetris/src/modules/CMakeLists.txt:8100-8563
/code/branches/tutoriallevel/src/modules/CMakeLists.txt:7827-8370
/code/branches/tutoriallevel2/src/modules/CMakeLists.txt:8370-8452
/code/branches/tutoriallevel3/src/modules/CMakeLists.txt:8453-8636
/code/branches/unity_build/src/modules/CMakeLists.txt:8440-8716
/code/branches/usability/src/modules/CMakeLists.txt:7915-8078
/code/branches/weapon/src/modules/CMakeLists.txt:1925-2094
/code/branches/weapon2/src/modules/CMakeLists.txt:2107-2488
/code/branches/weapons/src/modules/CMakeLists.txt:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/CMakeLists.txt:2742-2890
/code/trunk/src/modules/CMakeLists.txt:9189-9204
Property changes on: code/branches/presentation2012/src/modules/designtools
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/designtools:6592-7033
/code/branches/ai2/src/modules/designtools:8721-8880
/code/branches/bigships/src/modules/designtools:8137-8588
/code/branches/buildsystem/src/modules/designtools:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/designtools:2506-2658
/code/branches/buildsystem3/src/modules/designtools:2662-2708
/code/branches/ceguilua/src/modules/designtools:1802-1808
/code/branches/chat/src/modules/designtools:6527-6797
/code/branches/chat2/src/modules/designtools:6836-6910
/code/branches/console/src/modules/designtools:5941-6104
/code/branches/consolecommands2/src/modules/designtools:6451-7178
/code/branches/consolecommands3/src/modules/designtools:7178-7283
/code/branches/core3/src/modules/designtools:1572-1739
/code/branches/core4/src/modules/designtools: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/src/modules/designtools:5768-5928,6009
/code/branches/data_cleanup/src/modules/designtools:7537-7686
/code/branches/doc/src/modules/designtools:7290-7400
/code/branches/dockingsystem/src/modules/designtools:8101-8192
/code/branches/dockingsystem2/src/modules/designtools:8196-8560
/code/branches/dynamicmatch/src/modules/designtools:6584-7030
/code/branches/environment3/src/modules/designtools:8887-8975
/code/branches/formation/src/modules/designtools:8885-8991
/code/branches/fps/src/modules/designtools:6591-7072
/code/branches/gamecontent/src/modules/designtools:8893-8968
/code/branches/gameimmersion/src/modules/designtools:8102-8577
/code/branches/gamestate/src/modules/designtools:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/designtools:6594-6745
/code/branches/gametypes/src/modules/designtools:2826-3031
/code/branches/gcc43/src/modules/designtools:1580
/code/branches/gui/src/modules/designtools:1635-1723,2795-2894
/code/branches/hud/src/modules/designtools:8883-8986
/code/branches/hudelements/src/modules/designtools:6584-6941
/code/branches/hudimprovements/src/modules/designtools:7920-8672
/code/branches/ingamemenu/src/modules/designtools:6000-6023
/code/branches/input/src/modules/designtools:1629-1636
/code/branches/ipv6/src/modules/designtools:7293-7458
/code/branches/kicklib/src/modules/designtools:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/designtools:8282-8350
/code/branches/lastmanstanding/src/modules/designtools:7479-7644
/code/branches/lastmanstanding3/src/modules/designtools:7903-8175
/code/branches/libraries/src/modules/designtools:5612-5692
/code/branches/libraries2/src/modules/designtools:5703-5737
/code/branches/lod/src/modules/designtools:6586-6911
/code/branches/lodfinal/src/modules/designtools:2372-2411
/code/branches/mac_osx/src/modules/designtools:7789-8128,8135
/code/branches/map/src/modules/designtools:2801-3086,3089
/code/branches/masterserver/src/modules/designtools:7502-7738
/code/branches/masterserverfix/src/modules/designtools:8933-8936
/code/branches/menu/src/modules/designtools:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/designtools:8884-8976
/code/branches/miniprojects/src/modules/designtools:2754-2824
/code/branches/netp2/src/modules/designtools:2835-2988
/code/branches/netp3/src/modules/designtools:2988-3082
/code/branches/netp6/src/modules/designtools:3214-3302
/code/branches/network/src/modules/designtools:2356
/code/branches/network2/src/modules/designtools:6434-6465
/code/branches/network3/src/modules/designtools:7196-7344
/code/branches/network4/src/modules/designtools:7497-7755
/code/branches/network5/src/modules/designtools:7757-7781
/code/branches/network6/src/modules/designtools:7823-8315
/code/branches/network64/src/modules/designtools:2210-2355
/code/branches/newlevel2012/src/modules/designtools:9033-9240
/code/branches/notifications/src/modules/designtools:7314-7401
/code/branches/objecthierarchy/src/modules/designtools:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/designtools:2171-2479
/code/branches/ois_update/src/modules/designtools:7506-7788
/code/branches/output/src/modules/designtools:8739-8857
/code/branches/overlay/src/modules/designtools:2117-2385
/code/branches/particles/src/modules/designtools:2829-3085
/code/branches/particles2/src/modules/designtools:6050-6106,6109
/code/branches/pch/src/modules/designtools:3113-3194
/code/branches/physics/src/modules/designtools:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/designtools:2436-2457
/code/branches/pickup/src/modules/designtools:8145-8555
/code/branches/pickup2/src/modules/designtools:5942-6405
/code/branches/pickup2012/src/modules/designtools:9029-9189
/code/branches/pickup3/src/modules/designtools:6418-6523
/code/branches/pickup4/src/modules/designtools:6594-6710
/code/branches/pickups/src/modules/designtools:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/designtools:2107-2497,2915-3071
/code/branches/png2/src/modules/designtools:7262-7263
/code/branches/portals/src/modules/designtools:8087-8455
/code/branches/portals2/src/modules/designtools:8460-8602
/code/branches/ppspickups1/src/modules/designtools:6552-6708
/code/branches/ppspickups2/src/modules/designtools:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/designtools:6757-6997
/code/branches/ppspickups4/src/modules/designtools:7003-7089
/code/branches/presentation/src/modules/designtools:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/designtools:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/designtools:8974-9015
/code/branches/presentation3/src/modules/designtools:6913-7162
/code/branches/questsystem/src/modules/designtools:1894-2088
/code/branches/questsystem2/src/modules/designtools:2107-2259
/code/branches/questsystem5/src/modules/designtools:2776-2905
/code/branches/releasetodo/src/modules/designtools:7614-7647
/code/branches/resource/src/modules/designtools:3327-3366
/code/branches/resource2/src/modules/designtools:3372-5694
/code/branches/rocket/src/modules/designtools:6523-6950
/code/branches/rocket2/src/modules/designtools:6953-6970
/code/branches/script_trigger/src/modules/designtools:1295-1953,1955
/code/branches/shipSelection/src/modules/designtools:9038-9206
/code/branches/skybox2/src/modules/designtools:6559-6989
/code/branches/sound/src/modules/designtools:2829-3010
/code/branches/sound2012/src/modules/designtools:9205-9240
/code/branches/sound3/src/modules/designtools:5941-6102
/code/branches/spaceboundaries/src/modules/designtools:8085-8457
/code/branches/spaceboundaries2/src/modules/designtools:8460-8613
/code/branches/spacegate/src/modules/designtools:9030-9215
/code/branches/spacerace/src/modules/designtools:8182-8630
/code/branches/spaceraceTwo/src/modules/designtools:8881-8996
/code/branches/steering/src/modules/designtools:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/designtools:9028-9199
/code/branches/tetris/src/modules/designtools:8100-8563
/code/branches/tutoriallevel/src/modules/designtools:7827-8370
/code/branches/tutoriallevel2/src/modules/designtools:8370-8452
/code/branches/tutoriallevel3/src/modules/designtools:8453-8636
/code/branches/unity_build/src/modules/designtools:8440-8716
/code/branches/usability/src/modules/designtools:7915-8078
/code/branches/weapon/src/modules/designtools:1925-2094
/code/branches/weapon2/src/modules/designtools:2107-2488
/code/branches/weapons/src/modules/designtools:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/designtools:2742-2890
/code/trunk/src/modules/designtools:9189-9204
Property changes on: code/branches/presentation2012/src/modules/docking
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/docking:6592-7033
/code/branches/ai2/src/modules/docking:8721-8880
/code/branches/bigships/src/modules/docking:8137-8588
/code/branches/buildsystem/src/modules/docking:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/docking:2506-2658
/code/branches/buildsystem3/src/modules/docking:2662-2708
/code/branches/ceguilua/src/modules/docking:1802-1808
/code/branches/chat/src/modules/docking:6527-6797
/code/branches/chat2/src/modules/docking:6836-6910
/code/branches/console/src/modules/docking:5941-6104
/code/branches/consolecommands2/src/modules/docking:6451-7178
/code/branches/consolecommands3/src/modules/docking:7178-7283
/code/branches/core3/src/modules/docking:1572-1739
/code/branches/core4/src/modules/docking: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/src/modules/docking:5768-5928,6009
/code/branches/data_cleanup/src/modules/docking:7537-7686
/code/branches/doc/src/modules/docking:7290-7400
/code/branches/dockingsystem/src/modules/docking:8101-8192
/code/branches/dockingsystem2/src/modules/docking:8196-8560
/code/branches/dynamicmatch/src/modules/docking:6584-7030
/code/branches/environment3/src/modules/docking:8887-8975
/code/branches/formation/src/modules/docking:8885-8991
/code/branches/fps/src/modules/docking:6591-7072
/code/branches/gamecontent/src/modules/docking:8893-8968
/code/branches/gameimmersion/src/modules/docking:8102-8577
/code/branches/gamestate/src/modules/docking:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/docking:6594-6745
/code/branches/gametypes/src/modules/docking:2826-3031
/code/branches/gcc43/src/modules/docking:1580
/code/branches/gui/src/modules/docking:1635-1723,2795-2894
/code/branches/hud/src/modules/docking:8883-8986
/code/branches/hudelements/src/modules/docking:6584-6941
/code/branches/hudimprovements/src/modules/docking:7920-8672
/code/branches/ingamemenu/src/modules/docking:6000-6023
/code/branches/input/src/modules/docking:1629-1636
/code/branches/ipv6/src/modules/docking:7293-7458
/code/branches/kicklib/src/modules/docking:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/docking:8282-8350
/code/branches/lastmanstanding/src/modules/docking:7479-7644
/code/branches/lastmanstanding3/src/modules/docking:7903-8175
/code/branches/libraries/src/modules/docking:5612-5692
/code/branches/libraries2/src/modules/docking:5703-5737
/code/branches/lod/src/modules/docking:6586-6911
/code/branches/lodfinal/src/modules/docking:2372-2411
/code/branches/mac_osx/src/modules/docking:7789-8128,8135
/code/branches/map/src/modules/docking:2801-3086,3089
/code/branches/masterserver/src/modules/docking:7502-7738
/code/branches/masterserverfix/src/modules/docking:8933-8936
/code/branches/menu/src/modules/docking:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/docking:8884-8976
/code/branches/miniprojects/src/modules/docking:2754-2824
/code/branches/netp2/src/modules/docking:2835-2988
/code/branches/netp3/src/modules/docking:2988-3082
/code/branches/netp6/src/modules/docking:3214-3302
/code/branches/network/src/modules/docking:2356
/code/branches/network2/src/modules/docking:6434-6465
/code/branches/network3/src/modules/docking:7196-7344
/code/branches/network4/src/modules/docking:7497-7755
/code/branches/network5/src/modules/docking:7757-7781
/code/branches/network6/src/modules/docking:7823-8315
/code/branches/network64/src/modules/docking:2210-2355
/code/branches/newlevel2012/src/modules/docking:9033-9240
/code/branches/notifications/src/modules/docking:7314-7401
/code/branches/objecthierarchy/src/modules/docking:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/docking:2171-2479
/code/branches/ois_update/src/modules/docking:7506-7788
/code/branches/output/src/modules/docking:8739-8857
/code/branches/overlay/src/modules/docking:2117-2385
/code/branches/particles/src/modules/docking:2829-3085
/code/branches/particles2/src/modules/docking:6050-6106,6109
/code/branches/pch/src/modules/docking:3113-3194
/code/branches/physics/src/modules/docking:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/docking:2436-2457
/code/branches/pickup/src/modules/docking:8145-8555
/code/branches/pickup2/src/modules/docking:5942-6405
/code/branches/pickup2012/src/modules/docking:9029-9189
/code/branches/pickup3/src/modules/docking:6418-6523
/code/branches/pickup4/src/modules/docking:6594-6710
/code/branches/pickups/src/modules/docking:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/docking:2107-2497,2915-3071
/code/branches/png2/src/modules/docking:7262-7263
/code/branches/portals/src/modules/docking:8087-8455
/code/branches/portals2/src/modules/docking:8460-8602
/code/branches/ppspickups1/src/modules/docking:6552-6708
/code/branches/ppspickups2/src/modules/docking:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/docking:6757-6997
/code/branches/ppspickups4/src/modules/docking:7003-7089
/code/branches/presentation/src/modules/docking:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/docking:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/docking:8974-9015
/code/branches/presentation3/src/modules/docking:6913-7162
/code/branches/questsystem/src/modules/docking:1894-2088
/code/branches/questsystem2/src/modules/docking:2107-2259
/code/branches/questsystem5/src/modules/docking:2776-2905
/code/branches/releasetodo/src/modules/docking:7614-7647
/code/branches/resource/src/modules/docking:3327-3366
/code/branches/resource2/src/modules/docking:3372-5694
/code/branches/rocket/src/modules/docking:6523-6950
/code/branches/rocket2/src/modules/docking:6953-6970
/code/branches/script_trigger/src/modules/docking:1295-1953,1955
/code/branches/shipSelection/src/modules/docking:9038-9206
/code/branches/skybox2/src/modules/docking:6559-6989
/code/branches/sound/src/modules/docking:2829-3010
/code/branches/sound2012/src/modules/docking:9205-9240
/code/branches/sound3/src/modules/docking:5941-6102
/code/branches/spaceboundaries/src/modules/docking:8085-8457
/code/branches/spaceboundaries2/src/modules/docking:8460-8613
/code/branches/spacegate/src/modules/docking:9030-9215
/code/branches/spacerace/src/modules/docking:8182-8630
/code/branches/spaceraceTwo/src/modules/docking:8881-8996
/code/branches/steering/src/modules/docking:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/docking:9028-9199
/code/branches/tetris/src/modules/docking:8100-8563
/code/branches/tutoriallevel/src/modules/docking:7827-8370
/code/branches/tutoriallevel2/src/modules/docking:8370-8452
/code/branches/tutoriallevel3/src/modules/docking:8453-8636
/code/branches/unity_build/src/modules/docking:8440-8716
/code/branches/usability/src/modules/docking:7915-8078
/code/branches/weapon/src/modules/docking:1925-2094
/code/branches/weapon2/src/modules/docking:2107-2488
/code/branches/weapons/src/modules/docking:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/docking:2742-2890
/code/trunk/src/modules/docking:9189-9204
Property changes on: code/branches/presentation2012/src/modules/gametypes
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/gametypes:6592-7033
/code/branches/ai2/src/modules/gametypes:8721-8880
/code/branches/bigships/src/modules/gametypes:8137-8588
/code/branches/buildsystem/src/modules/gametypes:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/gametypes:2506-2658
/code/branches/buildsystem3/src/modules/gametypes:2662-2708
/code/branches/ceguilua/src/modules/gametypes:1802-1808
/code/branches/chat/src/modules/gametypes:6527-6797
/code/branches/chat2/src/modules/gametypes:6836-6910
/code/branches/console/src/modules/gametypes:5941-6104
/code/branches/consolecommands2/src/modules/gametypes:6451-7178
/code/branches/consolecommands3/src/modules/gametypes:7178-7283
/code/branches/core3/src/modules/gametypes:1572-1739
/code/branches/core4/src/modules/gametypes: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/src/modules/gametypes:5768-5928,6009
/code/branches/data_cleanup/src/modules/gametypes:7537-7686
/code/branches/doc/src/modules/gametypes:7290-7400
/code/branches/dockingsystem/src/modules/gametypes:8101-8192
/code/branches/dockingsystem2/src/modules/gametypes:8196-8560
/code/branches/dynamicmatch/src/modules/gametypes:6584-7030
/code/branches/environment3/src/modules/gametypes:8887-8975
/code/branches/formation/src/modules/gametypes:8885-8991
/code/branches/fps/src/modules/gametypes:6591-7072
/code/branches/gamecontent/src/modules/gametypes:8893-8968
/code/branches/gameimmersion/src/modules/gametypes:8102-8577
/code/branches/gamestate/src/modules/gametypes:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/gametypes:6594-6745
/code/branches/gametypes/src/modules/gametypes:2826-3031
/code/branches/gcc43/src/modules/gametypes:1580
/code/branches/gui/src/modules/gametypes:1635-1723,2795-2894
/code/branches/hud/src/modules/gametypes:8883-8986
/code/branches/hudelements/src/modules/gametypes:6584-6941
/code/branches/hudimprovements/src/modules/gametypes:7920-8672
/code/branches/ingamemenu/src/modules/gametypes:6000-6023
/code/branches/input/src/modules/gametypes:1629-1636
/code/branches/ipv6/src/modules/gametypes:7293-7458
/code/branches/kicklib/src/modules/gametypes:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/gametypes:8282-8350
/code/branches/lastmanstanding/src/modules/gametypes:7479-7644
/code/branches/lastmanstanding3/src/modules/gametypes:7903-8175
/code/branches/libraries/src/modules/gametypes:5612-5692
/code/branches/libraries2/src/modules/gametypes:5703-5737
/code/branches/lod/src/modules/gametypes:6586-6911
/code/branches/lodfinal/src/modules/gametypes:2372-2411
/code/branches/mac_osx/src/modules/gametypes:7789-8128,8135
/code/branches/map/src/modules/gametypes:2801-3086,3089
/code/branches/masterserver/src/modules/gametypes:7502-7738
/code/branches/masterserverfix/src/modules/gametypes:8933-8936
/code/branches/menu/src/modules/gametypes:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/gametypes:8884-8976
/code/branches/miniprojects/src/modules/gametypes:2754-2824
/code/branches/netp2/src/modules/gametypes:2835-2988
/code/branches/netp3/src/modules/gametypes:2988-3082
/code/branches/netp6/src/modules/gametypes:3214-3302
/code/branches/network/src/modules/gametypes:2356
/code/branches/network2/src/modules/gametypes:6434-6465
/code/branches/network3/src/modules/gametypes:7196-7344
/code/branches/network4/src/modules/gametypes:7497-7755
/code/branches/network5/src/modules/gametypes:7757-7781
/code/branches/network6/src/modules/gametypes:7823-8315
/code/branches/network64/src/modules/gametypes:2210-2355
/code/branches/newlevel2012/src/modules/gametypes:9033-9240
/code/branches/notifications/src/modules/gametypes:7314-7401
/code/branches/objecthierarchy/src/modules/gametypes:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/gametypes:2171-2479
/code/branches/ois_update/src/modules/gametypes:7506-7788
/code/branches/output/src/modules/gametypes:8739-8857
/code/branches/overlay/src/modules/gametypes:2117-2385
/code/branches/particles/src/modules/gametypes:2829-3085
/code/branches/particles2/src/modules/gametypes:6050-6106,6109
/code/branches/pch/src/modules/gametypes:3113-3194
/code/branches/physics/src/modules/gametypes:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/gametypes:2436-2457
/code/branches/pickup/src/modules/gametypes:8145-8555
/code/branches/pickup2/src/modules/gametypes:5942-6405
/code/branches/pickup2012/src/modules/gametypes:9029-9189
/code/branches/pickup3/src/modules/gametypes:6418-6523
/code/branches/pickup4/src/modules/gametypes:6594-6710
/code/branches/pickups/src/modules/gametypes:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/gametypes:2107-2497,2915-3071
/code/branches/png2/src/modules/gametypes:7262-7263
/code/branches/portals/src/modules/gametypes:8087-8455
/code/branches/portals2/src/modules/gametypes:8460-8602
/code/branches/ppspickups1/src/modules/gametypes:6552-6708
/code/branches/ppspickups2/src/modules/gametypes:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/gametypes:6757-6997
/code/branches/ppspickups4/src/modules/gametypes:7003-7089
/code/branches/presentation/src/modules/gametypes:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/gametypes:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/gametypes:8974-9015
/code/branches/presentation3/src/modules/gametypes:6913-7162
/code/branches/questsystem/src/modules/gametypes:1894-2088
/code/branches/questsystem2/src/modules/gametypes:2107-2259
/code/branches/questsystem5/src/modules/gametypes:2776-2905
/code/branches/releasetodo/src/modules/gametypes:7614-7647
/code/branches/resource/src/modules/gametypes:3327-3366
/code/branches/resource2/src/modules/gametypes:3372-5694
/code/branches/rocket/src/modules/gametypes:6523-6950
/code/branches/rocket2/src/modules/gametypes:6953-6970
/code/branches/script_trigger/src/modules/gametypes:1295-1953,1955
/code/branches/shipSelection/src/modules/gametypes:9038-9206
/code/branches/skybox2/src/modules/gametypes:6559-6989
/code/branches/sound/src/modules/gametypes:2829-3010
/code/branches/sound2012/src/modules/gametypes:9205-9240
/code/branches/sound3/src/modules/gametypes:5941-6102
/code/branches/spaceboundaries/src/modules/gametypes:8085-8457
/code/branches/spaceboundaries2/src/modules/gametypes:8460-8613
/code/branches/spacegate/src/modules/gametypes:9030-9215
/code/branches/spacerace/src/modules/gametypes:8182-8630
/code/branches/spaceraceTwo/src/modules/gametypes:8881-8996
/code/branches/steering/src/modules/gametypes:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/gametypes:9028-9199
/code/branches/tetris/src/modules/gametypes:8100-8563
/code/branches/tutoriallevel/src/modules/gametypes:7827-8370
/code/branches/tutoriallevel2/src/modules/gametypes:8370-8452
/code/branches/tutoriallevel3/src/modules/gametypes:8453-8636
/code/branches/unity_build/src/modules/gametypes:8440-8716
/code/branches/usability/src/modules/gametypes:7915-8078
/code/branches/weapon/src/modules/gametypes:1925-2094
/code/branches/weapon2/src/modules/gametypes:2107-2488
/code/branches/weapons/src/modules/gametypes:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/gametypes:2742-2890
/code/trunk/src/modules/gametypes:9189-9204
Property changes on: code/branches/presentation2012/src/modules/notifications
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/notifications:6592-7033
/code/branches/ai2/src/modules/notifications:8721-8880
/code/branches/bigships/src/modules/notifications:8137-8588
/code/branches/buildsystem/src/modules/notifications:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/notifications:2506-2658
/code/branches/buildsystem3/src/modules/notifications:2662-2708
/code/branches/ceguilua/src/modules/notifications:1802-1808
/code/branches/chat/src/modules/notifications:6527-6797
/code/branches/chat2/src/modules/notifications:6836-6910
/code/branches/console/src/modules/notifications:5941-6104
/code/branches/consolecommands2/src/modules/notifications:6451-7178
/code/branches/consolecommands3/src/modules/notifications:7178-7283
/code/branches/core3/src/modules/notifications:1572-1739
/code/branches/core4/src/modules/notifications: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/src/modules/notifications:5768-5928,6009
/code/branches/data_cleanup/src/modules/notifications:7537-7686
/code/branches/doc/src/modules/notifications:7290-7400
/code/branches/dockingsystem/src/modules/notifications:8101-8192
/code/branches/dockingsystem2/src/modules/notifications:8196-8560
/code/branches/dynamicmatch/src/modules/notifications:6584-7030
/code/branches/environment3/src/modules/notifications:8887-8975
/code/branches/formation/src/modules/notifications:8885-8991
/code/branches/fps/src/modules/notifications:6591-7072
/code/branches/gamecontent/src/modules/notifications:8893-8968
/code/branches/gameimmersion/src/modules/notifications:8102-8577
/code/branches/gamestate/src/modules/notifications:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/notifications:6594-6745
/code/branches/gametypes/src/modules/notifications:2826-3031
/code/branches/gcc43/src/modules/notifications:1580
/code/branches/gui/src/modules/notifications:1635-1723,2795-2894
/code/branches/hud/src/modules/notifications:8883-8986
/code/branches/hudelements/src/modules/notifications:6584-6941
/code/branches/hudimprovements/src/modules/notifications:7920-8672
/code/branches/ingamemenu/src/modules/notifications:6000-6023
/code/branches/input/src/modules/notifications:1629-1636
/code/branches/ipv6/src/modules/notifications:7293-7458
/code/branches/kicklib/src/modules/notifications:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/notifications:8282-8350
/code/branches/lastmanstanding/src/modules/notifications:7479-7644
/code/branches/lastmanstanding3/src/modules/notifications:7903-8175
/code/branches/libraries/src/modules/notifications:5612-5692
/code/branches/libraries2/src/modules/notifications:5703-5737
/code/branches/lod/src/modules/notifications:6586-6911
/code/branches/lodfinal/src/modules/notifications:2372-2411
/code/branches/mac_osx/src/modules/notifications:7789-8128,8135
/code/branches/map/src/modules/notifications:2801-3086,3089
/code/branches/masterserver/src/modules/notifications:7502-7738
/code/branches/masterserverfix/src/modules/notifications:8933-8936
/code/branches/menu/src/modules/notifications:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/notifications:8884-8976
/code/branches/miniprojects/src/modules/notifications:2754-2824
/code/branches/netp2/src/modules/notifications:2835-2988
/code/branches/netp3/src/modules/notifications:2988-3082
/code/branches/netp6/src/modules/notifications:3214-3302
/code/branches/network/src/modules/notifications:2356
/code/branches/network2/src/modules/notifications:6434-6465
/code/branches/network3/src/modules/notifications:7196-7344
/code/branches/network4/src/modules/notifications:7497-7755
/code/branches/network5/src/modules/notifications:7757-7781
/code/branches/network6/src/modules/notifications:7823-8315
/code/branches/network64/src/modules/notifications:2210-2355
/code/branches/newlevel2012/src/modules/notifications:9033-9240
/code/branches/notifications/src/modules/notifications:7314-7401
/code/branches/objecthierarchy/src/modules/notifications:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/notifications:2171-2479
/code/branches/ois_update/src/modules/notifications:7506-7788
/code/branches/output/src/modules/notifications:8739-8857
/code/branches/overlay/src/modules/notifications:2117-2385
/code/branches/particles/src/modules/notifications:2829-3085
/code/branches/particles2/src/modules/notifications:6050-6106,6109
/code/branches/pch/src/modules/notifications:3113-3194
/code/branches/physics/src/modules/notifications:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/notifications:2436-2457
/code/branches/pickup/src/modules/notifications:8145-8555
/code/branches/pickup2/src/modules/notifications:5942-6405
/code/branches/pickup2012/src/modules/notifications:9029-9189
/code/branches/pickup3/src/modules/notifications:6418-6523
/code/branches/pickup4/src/modules/notifications:6594-6710
/code/branches/pickups/src/modules/notifications:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/notifications:2107-2497,2915-3071
/code/branches/png2/src/modules/notifications:7262-7263
/code/branches/portals/src/modules/notifications:8087-8455
/code/branches/portals2/src/modules/notifications:8460-8602
/code/branches/ppspickups1/src/modules/notifications:6552-6708
/code/branches/ppspickups2/src/modules/notifications:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/notifications:6757-6997
/code/branches/ppspickups4/src/modules/notifications:7003-7089
/code/branches/presentation/src/modules/notifications:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/notifications:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/notifications:8974-9015
/code/branches/presentation3/src/modules/notifications:6913-7162
/code/branches/questsystem/src/modules/notifications:1894-2088
/code/branches/questsystem2/src/modules/notifications:2107-2259
/code/branches/questsystem5/src/modules/notifications:2776-2905
/code/branches/releasetodo/src/modules/notifications:7614-7647
/code/branches/resource/src/modules/notifications:3327-3366
/code/branches/resource2/src/modules/notifications:3372-5694
/code/branches/rocket/src/modules/notifications:6523-6950
/code/branches/rocket2/src/modules/notifications:6953-6970
/code/branches/script_trigger/src/modules/notifications:1295-1953,1955
/code/branches/shipSelection/src/modules/notifications:9038-9206
/code/branches/skybox2/src/modules/notifications:6559-6989
/code/branches/sound/src/modules/notifications:2829-3010
/code/branches/sound2012/src/modules/notifications:9205-9240
/code/branches/sound3/src/modules/notifications:5941-6102
/code/branches/spaceboundaries/src/modules/notifications:8085-8457
/code/branches/spaceboundaries2/src/modules/notifications:8460-8613
/code/branches/spacegate/src/modules/notifications:9030-9215
/code/branches/spacerace/src/modules/notifications:8182-8630
/code/branches/spaceraceTwo/src/modules/notifications:8881-8996
/code/branches/steering/src/modules/notifications:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/notifications:9028-9199
/code/branches/tetris/src/modules/notifications:8100-8563
/code/branches/tutoriallevel/src/modules/notifications:7827-8370
/code/branches/tutoriallevel2/src/modules/notifications:8370-8452
/code/branches/tutoriallevel3/src/modules/notifications:8453-8636
/code/branches/unity_build/src/modules/notifications:8440-8716
/code/branches/usability/src/modules/notifications:7915-8078
/code/branches/weapon/src/modules/notifications:1925-2094
/code/branches/weapon2/src/modules/notifications:2107-2488
/code/branches/weapons/src/modules/notifications:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/notifications:2742-2890
/code/trunk/src/modules/notifications:9189-9204
Property changes on: code/branches/presentation2012/src/modules/objects
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/objects:6592-7033
/code/branches/ai2/src/modules/objects:8721-8880
/code/branches/bigships/src/modules/objects:8137-8588
/code/branches/buildsystem/src/modules/objects:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/objects:2506-2658
/code/branches/buildsystem3/src/modules/objects:2662-2708
/code/branches/ceguilua/src/modules/objects:1802-1808
/code/branches/chat/src/modules/objects:6527-6797
/code/branches/chat2/src/modules/objects:6836-6910
/code/branches/console/src/modules/objects:5941-6104
/code/branches/consolecommands2/src/modules/objects:6451-7178
/code/branches/consolecommands3/src/modules/objects:7178-7283
/code/branches/core3/src/modules/objects:1572-1739
/code/branches/core4/src/modules/objects: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/src/modules/objects:5768-5928,6009
/code/branches/data_cleanup/src/modules/objects:7537-7686
/code/branches/doc/src/modules/objects:7290-7400
/code/branches/dockingsystem/src/modules/objects:8101-8192
/code/branches/dockingsystem2/src/modules/objects:8196-8560
/code/branches/dynamicmatch/src/modules/objects:6584-7030
/code/branches/environment3/src/modules/objects:8887-8975
/code/branches/formation/src/modules/objects:8885-8991
/code/branches/fps/src/modules/objects:6591-7072
/code/branches/gamecontent/src/modules/objects:8893-8968
/code/branches/gameimmersion/src/modules/objects:8102-8577
/code/branches/gamestate/src/modules/objects:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/objects:6594-6745
/code/branches/gametypes/src/modules/objects:2826-3031
/code/branches/gcc43/src/modules/objects:1580
/code/branches/gui/src/modules/objects:1635-1723,2795-2894
/code/branches/hud/src/modules/objects:8883-8986
/code/branches/hudelements/src/modules/objects:6584-6941
/code/branches/hudimprovements/src/modules/objects:7920-8672
/code/branches/ingamemenu/src/modules/objects:6000-6023
/code/branches/input/src/modules/objects:1629-1636
/code/branches/ipv6/src/modules/objects:7293-7458
/code/branches/kicklib/src/modules/objects:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/objects:8282-8350
/code/branches/lastmanstanding/src/modules/objects:7479-7644
/code/branches/lastmanstanding3/src/modules/objects:7903-8175
/code/branches/libraries/src/modules/objects:5612-5692
/code/branches/libraries2/src/modules/objects:5703-5737
/code/branches/lod/src/modules/objects:6586-6911
/code/branches/lodfinal/src/modules/objects:2372-2411
/code/branches/mac_osx/src/modules/objects:7789-8128,8135
/code/branches/map/src/modules/objects:2801-3086,3089
/code/branches/masterserver/src/modules/objects:7502-7738
/code/branches/masterserverfix/src/modules/objects:8933-8936
/code/branches/menu/src/modules/objects:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/objects:8884-8976
/code/branches/miniprojects/src/modules/objects:2754-2824
/code/branches/netp2/src/modules/objects:2835-2988
/code/branches/netp3/src/modules/objects:2988-3082
/code/branches/netp6/src/modules/objects:3214-3302
/code/branches/network/src/modules/objects:2356
/code/branches/network2/src/modules/objects:6434-6465
/code/branches/network3/src/modules/objects:7196-7344
/code/branches/network4/src/modules/objects:7497-7755
/code/branches/network5/src/modules/objects:7757-7781
/code/branches/network6/src/modules/objects:7823-8315
/code/branches/network64/src/modules/objects:2210-2355
/code/branches/newlevel2012/src/modules/objects:9033-9240
/code/branches/notifications/src/modules/objects:7314-7401
/code/branches/objecthierarchy/src/modules/objects:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/objects:2171-2479
/code/branches/ois_update/src/modules/objects:7506-7788
/code/branches/output/src/modules/objects:8739-8857
/code/branches/overlay/src/modules/objects:2117-2385
/code/branches/particles/src/modules/objects:2829-3085
/code/branches/particles2/src/modules/objects:6050-6106,6109
/code/branches/pch/src/modules/objects:3113-3194
/code/branches/physics/src/modules/objects:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/objects:2436-2457
/code/branches/pickup/src/modules/objects:8145-8555
/code/branches/pickup2/src/modules/objects:5942-6405
/code/branches/pickup2012/src/modules/objects:9029-9189
/code/branches/pickup3/src/modules/objects:6418-6523
/code/branches/pickup4/src/modules/objects:6594-6710
/code/branches/pickups/src/modules/objects:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/objects:2107-2497,2915-3071
/code/branches/png2/src/modules/objects:7262-7263
/code/branches/portals/src/modules/objects:8087-8455
/code/branches/portals2/src/modules/objects:8460-8602
/code/branches/ppspickups1/src/modules/objects:6552-6708
/code/branches/ppspickups2/src/modules/objects:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/objects:6757-6997
/code/branches/ppspickups4/src/modules/objects:7003-7089
/code/branches/presentation/src/modules/objects:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/objects:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/objects:8974-9015
/code/branches/presentation3/src/modules/objects:6913-7162
/code/branches/questsystem/src/modules/objects:1894-2088
/code/branches/questsystem2/src/modules/objects:2107-2259
/code/branches/questsystem5/src/modules/objects:2776-2905
/code/branches/releasetodo/src/modules/objects:7614-7647
/code/branches/resource/src/modules/objects:3327-3366
/code/branches/resource2/src/modules/objects:3372-5694
/code/branches/rocket/src/modules/objects:6523-6950
/code/branches/rocket2/src/modules/objects:6953-6970
/code/branches/script_trigger/src/modules/objects:1295-1953,1955
/code/branches/shipSelection/src/modules/objects:9038-9206
/code/branches/skybox2/src/modules/objects:6559-6989
/code/branches/sound/src/modules/objects:2829-3010
/code/branches/sound2012/src/modules/objects:9205-9240
/code/branches/sound3/src/modules/objects:5941-6102
/code/branches/spaceboundaries/src/modules/objects:8085-8457
/code/branches/spaceboundaries2/src/modules/objects:8460-8613
/code/branches/spacegate/src/modules/objects:9030-9215
/code/branches/spacerace/src/modules/objects:8182-8630
/code/branches/spaceraceTwo/src/modules/objects:8881-8996
/code/branches/steering/src/modules/objects:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/objects:9028-9199
/code/branches/tetris/src/modules/objects:8100-8563
/code/branches/tutoriallevel/src/modules/objects:7827-8370
/code/branches/tutoriallevel2/src/modules/objects:8370-8452
/code/branches/tutoriallevel3/src/modules/objects:8453-8636
/code/branches/unity_build/src/modules/objects:8440-8716
/code/branches/usability/src/modules/objects:7915-8078
/code/branches/weapon/src/modules/objects:1925-2094
/code/branches/weapon2/src/modules/objects:2107-2488
/code/branches/weapons/src/modules/objects:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/objects:2742-2890
/code/trunk/src/modules/objects:9189-9204
Property changes on: code/branches/presentation2012/src/modules/overlays
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/overlays:6592-7033
/code/branches/ai2/src/modules/overlays:8721-8880
/code/branches/bigships/src/modules/overlays:8137-8588
/code/branches/buildsystem/src/modules/overlays:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/overlays:2506-2658
/code/branches/buildsystem3/src/modules/overlays:2662-2708
/code/branches/ceguilua/src/modules/overlays:1802-1808
/code/branches/chat/src/modules/overlays:6527-6797
/code/branches/chat2/src/modules/overlays:6836-6910
/code/branches/console/src/modules/overlays:5941-6104
/code/branches/consolecommands2/src/modules/overlays:6451-7178
/code/branches/consolecommands3/src/modules/overlays:7178-7283
/code/branches/core3/src/modules/overlays:1572-1739
/code/branches/core4/src/modules/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/src/modules/overlays:5768-5928,6009
/code/branches/data_cleanup/src/modules/overlays:7537-7686
/code/branches/doc/src/modules/overlays:7290-7400
/code/branches/dockingsystem/src/modules/overlays:8101-8192
/code/branches/dockingsystem2/src/modules/overlays:8196-8560
/code/branches/dynamicmatch/src/modules/overlays:6584-7030
/code/branches/environment3/src/modules/overlays:8887-8975
/code/branches/formation/src/modules/overlays:8885-8991
/code/branches/fps/src/modules/overlays:6591-7072
/code/branches/gamecontent/src/modules/overlays:8893-8968
/code/branches/gameimmersion/src/modules/overlays:8102-8577
/code/branches/gamestate/src/modules/overlays:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/overlays:6594-6745
/code/branches/gametypes/src/modules/overlays:2826-3031
/code/branches/gcc43/src/modules/overlays:1580
/code/branches/gui/src/modules/overlays:1635-1723,2795-2894
/code/branches/hud/src/modules/overlays:8883-8986
/code/branches/hudelements/src/modules/overlays:6584-6941
/code/branches/hudimprovements/src/modules/overlays:7920-8672
/code/branches/ingamemenu/src/modules/overlays:6000-6023
/code/branches/input/src/modules/overlays:1629-1636
/code/branches/ipv6/src/modules/overlays:7293-7458
/code/branches/kicklib/src/modules/overlays:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/overlays:8282-8350
/code/branches/lastmanstanding/src/modules/overlays:7479-7644
/code/branches/lastmanstanding3/src/modules/overlays:7903-8175
/code/branches/libraries/src/modules/overlays:5612-5692
/code/branches/libraries2/src/modules/overlays:5703-5737
/code/branches/lod/src/modules/overlays:6586-6911
/code/branches/lodfinal/src/modules/overlays:2372-2411
/code/branches/mac_osx/src/modules/overlays:7789-8128,8135
/code/branches/map/src/modules/overlays:2801-3086,3089
/code/branches/masterserver/src/modules/overlays:7502-7738
/code/branches/masterserverfix/src/modules/overlays:8933-8936
/code/branches/menu/src/modules/overlays:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/overlays:8884-8976
/code/branches/miniprojects/src/modules/overlays:2754-2824
/code/branches/netp2/src/modules/overlays:2835-2988
/code/branches/netp3/src/modules/overlays:2988-3082
/code/branches/netp6/src/modules/overlays:3214-3302
/code/branches/network/src/modules/overlays:2356
/code/branches/network2/src/modules/overlays:6434-6465
/code/branches/network3/src/modules/overlays:7196-7344
/code/branches/network4/src/modules/overlays:7497-7755
/code/branches/network5/src/modules/overlays:7757-7781
/code/branches/network6/src/modules/overlays:7823-8315
/code/branches/network64/src/modules/overlays:2210-2355
/code/branches/newlevel2012/src/modules/overlays:9033-9240
/code/branches/notifications/src/modules/overlays:7314-7401
/code/branches/objecthierarchy/src/modules/overlays:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/overlays:2171-2479
/code/branches/ois_update/src/modules/overlays:7506-7788
/code/branches/output/src/modules/overlays:8739-8857
/code/branches/overlay/src/modules/overlays:2117-2385
/code/branches/particles/src/modules/overlays:2829-3085
/code/branches/particles2/src/modules/overlays:6050-6106,6109
/code/branches/pch/src/modules/overlays:3113-3194
/code/branches/physics/src/modules/overlays:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/overlays:2436-2457
/code/branches/pickup/src/modules/overlays:8145-8555
/code/branches/pickup2/src/modules/overlays:5942-6405
/code/branches/pickup2012/src/modules/overlays:9029-9189
/code/branches/pickup3/src/modules/overlays:6418-6523
/code/branches/pickup4/src/modules/overlays:6594-6710
/code/branches/pickups/src/modules/overlays:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/overlays:2107-2497,2915-3071
/code/branches/png2/src/modules/overlays:7262-7263
/code/branches/portals/src/modules/overlays:8087-8455
/code/branches/portals2/src/modules/overlays:8460-8602
/code/branches/ppspickups1/src/modules/overlays:6552-6708
/code/branches/ppspickups2/src/modules/overlays:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/overlays:6757-6997
/code/branches/ppspickups4/src/modules/overlays:7003-7089
/code/branches/presentation/src/modules/overlays:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/overlays:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/overlays:8974-9015
/code/branches/presentation3/src/modules/overlays:6913-7162
/code/branches/questsystem/src/modules/overlays:1894-2088
/code/branches/questsystem2/src/modules/overlays:2107-2259
/code/branches/questsystem5/src/modules/overlays:2776-2905
/code/branches/releasetodo/src/modules/overlays:7614-7647
/code/branches/resource/src/modules/overlays:3327-3366
/code/branches/resource2/src/modules/overlays:3372-5694
/code/branches/rocket/src/modules/overlays:6523-6950
/code/branches/rocket2/src/modules/overlays:6953-6970
/code/branches/script_trigger/src/modules/overlays:1295-1953,1955
/code/branches/shipSelection/src/modules/overlays:9038-9206
/code/branches/skybox2/src/modules/overlays:6559-6989
/code/branches/sound/src/modules/overlays:2829-3010
/code/branches/sound2012/src/modules/overlays:9205-9240
/code/branches/sound3/src/modules/overlays:5941-6102
/code/branches/spaceboundaries/src/modules/overlays:8085-8457
/code/branches/spaceboundaries2/src/modules/overlays:8460-8613
/code/branches/spacegate/src/modules/overlays:9030-9215
/code/branches/spacerace/src/modules/overlays:8182-8630
/code/branches/spaceraceTwo/src/modules/overlays:8881-8996
/code/branches/steering/src/modules/overlays:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/overlays:9028-9199
/code/branches/tetris/src/modules/overlays:8100-8563
/code/branches/tutoriallevel/src/modules/overlays:7827-8370
/code/branches/tutoriallevel2/src/modules/overlays:8370-8452
/code/branches/tutoriallevel3/src/modules/overlays:8453-8636
/code/branches/unity_build/src/modules/overlays:8440-8716
/code/branches/usability/src/modules/overlays:7915-8078
/code/branches/weapon/src/modules/overlays:1925-2094
/code/branches/weapon2/src/modules/overlays:2107-2488
/code/branches/weapons/src/modules/overlays:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/overlays:2742-2890
/code/trunk/src/modules/overlays:9189-9204
Property changes on: code/branches/presentation2012/src/modules/pickup
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/pickup:6592-7033
/code/branches/ai2/src/modules/pickup:8721-8880
/code/branches/bigships/src/modules/pickup:8137-8588
/code/branches/buildsystem/src/modules/pickup:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/pickup:2506-2658
/code/branches/buildsystem3/src/modules/pickup:2662-2708
/code/branches/ceguilua/src/modules/pickup:1802-1808
/code/branches/chat/src/modules/pickup:6527-6797
/code/branches/chat2/src/modules/pickup:6836-6910
/code/branches/console/src/modules/pickup:5941-6104
/code/branches/consolecommands2/src/modules/pickup:6451-7178
/code/branches/consolecommands3/src/modules/pickup:7178-7283
/code/branches/core3/src/modules/pickup:1572-1739
/code/branches/core4/src/modules/pickup: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/src/modules/pickup:5768-5928,6009
/code/branches/data_cleanup/src/modules/pickup:7537-7686
/code/branches/doc/src/modules/pickup:7290-7400
/code/branches/dockingsystem/src/modules/pickup:8101-8192
/code/branches/dockingsystem2/src/modules/pickup:8196-8560
/code/branches/dynamicmatch/src/modules/pickup:6584-7030
/code/branches/environment3/src/modules/pickup:8887-8975
/code/branches/formation/src/modules/pickup:8885-8991
/code/branches/fps/src/modules/pickup:6591-7072
/code/branches/gamecontent/src/modules/pickup:8893-8968
/code/branches/gameimmersion/src/modules/pickup:8102-8577
/code/branches/gamestate/src/modules/pickup:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/pickup:6594-6745
/code/branches/gametypes/src/modules/pickup:2826-3031
/code/branches/gcc43/src/modules/pickup:1580
/code/branches/gui/src/modules/pickup:1635-1723,2795-2894
/code/branches/hud/src/modules/pickup:8883-8986
/code/branches/hudelements/src/modules/pickup:6584-6941
/code/branches/hudimprovements/src/modules/pickup:7920-8672
/code/branches/ingamemenu/src/modules/pickup:6000-6023
/code/branches/input/src/modules/pickup:1629-1636
/code/branches/ipv6/src/modules/pickup:7293-7458
/code/branches/kicklib/src/modules/pickup:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/pickup:8282-8350
/code/branches/lastmanstanding/src/modules/pickup:7479-7644
/code/branches/lastmanstanding3/src/modules/pickup:7903-8175
/code/branches/libraries/src/modules/pickup:5612-5692
/code/branches/libraries2/src/modules/pickup:5703-5737
/code/branches/lod/src/modules/pickup:6586-6911
/code/branches/lodfinal/src/modules/pickup:2372-2411
/code/branches/mac_osx/src/modules/pickup:7789-8128,8135
/code/branches/map/src/modules/pickup:2801-3086,3089
/code/branches/masterserver/src/modules/pickup:7502-7738
/code/branches/masterserverfix/src/modules/pickup:8933-8936
/code/branches/menu/src/modules/pickup:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/pickup:8884-8976
/code/branches/miniprojects/src/modules/pickup:2754-2824
/code/branches/netp2/src/modules/pickup:2835-2988
/code/branches/netp3/src/modules/pickup:2988-3082
/code/branches/netp6/src/modules/pickup:3214-3302
/code/branches/network/src/modules/pickup:2356
/code/branches/network2/src/modules/pickup:6434-6465
/code/branches/network3/src/modules/pickup:7196-7344
/code/branches/network4/src/modules/pickup:7497-7755
/code/branches/network5/src/modules/pickup:7757-7781
/code/branches/network6/src/modules/pickup:7823-8315
/code/branches/network64/src/modules/pickup:2210-2355
/code/branches/newlevel2012/src/modules/pickup:9033-9240
/code/branches/notifications/src/modules/pickup:7314-7401
/code/branches/objecthierarchy/src/modules/pickup:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/pickup:2171-2479
/code/branches/ois_update/src/modules/pickup:7506-7788
/code/branches/output/src/modules/pickup:8739-8857
/code/branches/overlay/src/modules/pickup:2117-2385
/code/branches/particles/src/modules/pickup:2829-3085
/code/branches/particles2/src/modules/pickup:6050-6106,6109
/code/branches/pch/src/modules/pickup:3113-3194
/code/branches/physics/src/modules/pickup:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/pickup:2436-2457
/code/branches/pickup/src/modules/pickup:8145-8555
/code/branches/pickup2/src/modules/pickup:5942-6405
/code/branches/pickup2012/src/modules/pickup:9029-9189
/code/branches/pickup3/src/modules/pickup:6418-6523
/code/branches/pickup4/src/modules/pickup:6594-6710
/code/branches/pickups/src/modules/pickup:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/pickup:2107-2497,2915-3071
/code/branches/png2/src/modules/pickup:7262-7263
/code/branches/portals/src/modules/pickup:8087-8455
/code/branches/portals2/src/modules/pickup:8460-8602
/code/branches/ppspickups1/src/modules/pickup:6552-6708
/code/branches/ppspickups2/src/modules/pickup:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/pickup:6757-6997
/code/branches/ppspickups4/src/modules/pickup:7003-7089
/code/branches/presentation/src/modules/pickup:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/pickup:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/pickup:8974-9015
/code/branches/presentation3/src/modules/pickup:6913-7162
/code/branches/questsystem/src/modules/pickup:1894-2088
/code/branches/questsystem2/src/modules/pickup:2107-2259
/code/branches/questsystem5/src/modules/pickup:2776-2905
/code/branches/releasetodo/src/modules/pickup:7614-7647
/code/branches/resource/src/modules/pickup:3327-3366
/code/branches/resource2/src/modules/pickup:3372-5694
/code/branches/rocket/src/modules/pickup:6523-6950
/code/branches/rocket2/src/modules/pickup:6953-6970
/code/branches/script_trigger/src/modules/pickup:1295-1953,1955
/code/branches/shipSelection/src/modules/pickup:9038-9206
/code/branches/skybox2/src/modules/pickup:6559-6989
/code/branches/sound/src/modules/pickup:2829-3010
/code/branches/sound2012/src/modules/pickup:9205-9240
/code/branches/sound3/src/modules/pickup:5941-6102
/code/branches/spaceboundaries/src/modules/pickup:8085-8457
/code/branches/spaceboundaries2/src/modules/pickup:8460-8613
/code/branches/spacegate/src/modules/pickup:9030-9215
/code/branches/spacerace/src/modules/pickup:8182-8630
/code/branches/spaceraceTwo/src/modules/pickup:8881-8996
/code/branches/steering/src/modules/pickup:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/pickup:9028-9199
/code/branches/tetris/src/modules/pickup:8100-8563
/code/branches/tutoriallevel/src/modules/pickup:7827-8370
/code/branches/tutoriallevel2/src/modules/pickup:8370-8452
/code/branches/tutoriallevel3/src/modules/pickup:8453-8636
/code/branches/unity_build/src/modules/pickup:8440-8716
/code/branches/usability/src/modules/pickup:7915-8078
/code/branches/weapon/src/modules/pickup:1925-2094
/code/branches/weapon2/src/modules/pickup:2107-2488
/code/branches/weapons/src/modules/pickup:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/pickup:2742-2890
/code/trunk/src/modules/pickup:9189-9204
Property changes on: code/branches/presentation2012/src/modules/pong
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/pong:6592-7033
/code/branches/ai2/src/modules/pong:8721-8880
/code/branches/bigships/src/modules/pong:8137-8588
/code/branches/buildsystem/src/modules/pong:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/pong:2506-2658
/code/branches/buildsystem3/src/modules/pong:2662-2708
/code/branches/ceguilua/src/modules/pong:1802-1808
/code/branches/chat/src/modules/pong:6527-6797
/code/branches/chat2/src/modules/pong:6836-6910
/code/branches/console/src/modules/pong:5941-6104
/code/branches/consolecommands2/src/modules/pong:6451-7178
/code/branches/consolecommands3/src/modules/pong:7178-7283
/code/branches/core3/src/modules/pong:1572-1739
/code/branches/core4/src/modules/pong: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/src/modules/pong:5768-5928,6009
/code/branches/data_cleanup/src/modules/pong:7537-7686
/code/branches/doc/src/modules/pong:7290-7400
/code/branches/dockingsystem/src/modules/pong:8101-8192
/code/branches/dockingsystem2/src/modules/pong:8196-8560
/code/branches/dynamicmatch/src/modules/pong:6584-7030
/code/branches/environment3/src/modules/pong:8887-8975
/code/branches/formation/src/modules/pong:8885-8991
/code/branches/fps/src/modules/pong:6591-7072
/code/branches/gamecontent/src/modules/pong:8893-8968
/code/branches/gameimmersion/src/modules/pong:8102-8577
/code/branches/gamestate/src/modules/pong:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/pong:6594-6745
/code/branches/gametypes/src/modules/pong:2826-3031
/code/branches/gcc43/src/modules/pong:1580
/code/branches/gui/src/modules/pong:1635-1723,2795-2894
/code/branches/hud/src/modules/pong:8883-8986
/code/branches/hudelements/src/modules/pong:6584-6941
/code/branches/hudimprovements/src/modules/pong:7920-8672
/code/branches/ingamemenu/src/modules/pong:6000-6023
/code/branches/input/src/modules/pong:1629-1636
/code/branches/ipv6/src/modules/pong:7293-7458
/code/branches/kicklib/src/modules/pong:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/pong:8282-8350
/code/branches/lastmanstanding/src/modules/pong:7479-7644
/code/branches/lastmanstanding3/src/modules/pong:7903-8175
/code/branches/libraries/src/modules/pong:5612-5692
/code/branches/libraries2/src/modules/pong:5703-5737
/code/branches/lod/src/modules/pong:6586-6911
/code/branches/lodfinal/src/modules/pong:2372-2411
/code/branches/mac_osx/src/modules/pong:7789-8128,8135
/code/branches/map/src/modules/pong:2801-3086,3089
/code/branches/masterserver/src/modules/pong:7502-7738
/code/branches/masterserverfix/src/modules/pong:8933-8936
/code/branches/menu/src/modules/pong:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/pong:8884-8976
/code/branches/miniprojects/src/modules/pong:2754-2824
/code/branches/netp2/src/modules/pong:2835-2988
/code/branches/netp3/src/modules/pong:2988-3082
/code/branches/netp6/src/modules/pong:3214-3302
/code/branches/network/src/modules/pong:2356
/code/branches/network2/src/modules/pong:6434-6465
/code/branches/network3/src/modules/pong:7196-7344
/code/branches/network4/src/modules/pong:7497-7755
/code/branches/network5/src/modules/pong:7757-7781
/code/branches/network6/src/modules/pong:7823-8315
/code/branches/network64/src/modules/pong:2210-2355
/code/branches/newlevel2012/src/modules/pong:9033-9240
/code/branches/notifications/src/modules/pong:7314-7401
/code/branches/objecthierarchy/src/modules/pong:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/pong:2171-2479
/code/branches/ois_update/src/modules/pong:7506-7788
/code/branches/output/src/modules/pong:8739-8857
/code/branches/overlay/src/modules/pong:2117-2385
/code/branches/particles/src/modules/pong:2829-3085
/code/branches/particles2/src/modules/pong:6050-6106,6109
/code/branches/pch/src/modules/pong:3113-3194
/code/branches/physics/src/modules/pong:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/pong:2436-2457
/code/branches/pickup/src/modules/pong:8145-8555
/code/branches/pickup2/src/modules/pong:5942-6405
/code/branches/pickup2012/src/modules/pong:9029-9189
/code/branches/pickup3/src/modules/pong:6418-6523
/code/branches/pickup4/src/modules/pong:6594-6710
/code/branches/pickups/src/modules/pong:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/pong:2107-2497,2915-3071
/code/branches/png2/src/modules/pong:7262-7263
/code/branches/portals/src/modules/pong:8087-8455
/code/branches/portals2/src/modules/pong:8460-8602
/code/branches/ppspickups1/src/modules/pong:6552-6708
/code/branches/ppspickups2/src/modules/pong:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/pong:6757-6997
/code/branches/ppspickups4/src/modules/pong:7003-7089
/code/branches/presentation/src/modules/pong:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/pong:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/pong:8974-9015
/code/branches/presentation3/src/modules/pong:6913-7162
/code/branches/questsystem/src/modules/pong:1894-2088
/code/branches/questsystem2/src/modules/pong:2107-2259
/code/branches/questsystem5/src/modules/pong:2776-2905
/code/branches/releasetodo/src/modules/pong:7614-7647
/code/branches/resource/src/modules/pong:3327-3366
/code/branches/resource2/src/modules/pong:3372-5694
/code/branches/rocket/src/modules/pong:6523-6950
/code/branches/rocket2/src/modules/pong:6953-6970
/code/branches/script_trigger/src/modules/pong:1295-1953,1955
/code/branches/shipSelection/src/modules/pong:9038-9206
/code/branches/skybox2/src/modules/pong:6559-6989
/code/branches/sound/src/modules/pong:2829-3010
/code/branches/sound2012/src/modules/pong:9205-9240
/code/branches/sound3/src/modules/pong:5941-6102
/code/branches/spaceboundaries/src/modules/pong:8085-8457
/code/branches/spaceboundaries2/src/modules/pong:8460-8613
/code/branches/spacegate/src/modules/pong:9030-9215
/code/branches/spacerace/src/modules/pong:8182-8630
/code/branches/spaceraceTwo/src/modules/pong:8881-8996
/code/branches/steering/src/modules/pong:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/pong:9028-9199
/code/branches/tetris/src/modules/pong:8100-8563
/code/branches/tutoriallevel/src/modules/pong:7827-8370
/code/branches/tutoriallevel2/src/modules/pong:8370-8452
/code/branches/tutoriallevel3/src/modules/pong:8453-8636
/code/branches/unity_build/src/modules/pong:8440-8716
/code/branches/usability/src/modules/pong:7915-8078
/code/branches/weapon/src/modules/pong:1925-2094
/code/branches/weapon2/src/modules/pong:2107-2488
/code/branches/weapons/src/modules/pong:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/pong:2742-2890
/code/trunk/src/modules/pong:9189-9204
Property changes on: code/branches/presentation2012/src/modules/portals
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/portals:6592-7033
/code/branches/ai2/src/modules/portals:8721-8880
/code/branches/bigships/src/modules/portals:8137-8588
/code/branches/buildsystem/src/modules/portals:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/portals:2506-2658
/code/branches/buildsystem3/src/modules/portals:2662-2708
/code/branches/ceguilua/src/modules/portals:1802-1808
/code/branches/chat/src/modules/portals:6527-6797
/code/branches/chat2/src/modules/portals:6836-6910
/code/branches/console/src/modules/portals:5941-6104
/code/branches/consolecommands2/src/modules/portals:6451-7178
/code/branches/consolecommands3/src/modules/portals:7178-7283
/code/branches/core3/src/modules/portals:1572-1739
/code/branches/core4/src/modules/portals: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/src/modules/portals:5768-5928,6009
/code/branches/data_cleanup/src/modules/portals:7537-7686
/code/branches/doc/src/modules/portals:7290-7400
/code/branches/dockingsystem/src/modules/portals:8101-8192
/code/branches/dockingsystem2/src/modules/portals:8196-8560
/code/branches/dynamicmatch/src/modules/portals:6584-7030
/code/branches/environment3/src/modules/portals:8887-8975
/code/branches/formation/src/modules/portals:8885-8991
/code/branches/fps/src/modules/portals:6591-7072
/code/branches/gamecontent/src/modules/portals:8893-8968
/code/branches/gameimmersion/src/modules/portals:8102-8577
/code/branches/gamestate/src/modules/portals:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/portals:6594-6745
/code/branches/gametypes/src/modules/portals:2826-3031
/code/branches/gcc43/src/modules/portals:1580
/code/branches/gui/src/modules/portals:1635-1723,2795-2894
/code/branches/hud/src/modules/portals:8883-8986
/code/branches/hudelements/src/modules/portals:6584-6941
/code/branches/hudimprovements/src/modules/portals:7920-8672
/code/branches/ingamemenu/src/modules/portals:6000-6023
/code/branches/input/src/modules/portals:1629-1636
/code/branches/ipv6/src/modules/portals:7293-7458
/code/branches/kicklib/src/modules/portals:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/portals:8282-8350
/code/branches/lastmanstanding/src/modules/portals:7479-7644
/code/branches/lastmanstanding3/src/modules/portals:7903-8175
/code/branches/libraries/src/modules/portals:5612-5692
/code/branches/libraries2/src/modules/portals:5703-5737
/code/branches/lod/src/modules/portals:6586-6911
/code/branches/lodfinal/src/modules/portals:2372-2411
/code/branches/mac_osx/src/modules/portals:7789-8128,8135
/code/branches/map/src/modules/portals:2801-3086,3089
/code/branches/masterserver/src/modules/portals:7502-7738
/code/branches/masterserverfix/src/modules/portals:8933-8936
/code/branches/menu/src/modules/portals:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/portals:8884-8976
/code/branches/miniprojects/src/modules/portals:2754-2824
/code/branches/netp2/src/modules/portals:2835-2988
/code/branches/netp3/src/modules/portals:2988-3082
/code/branches/netp6/src/modules/portals:3214-3302
/code/branches/network/src/modules/portals:2356
/code/branches/network2/src/modules/portals:6434-6465
/code/branches/network3/src/modules/portals:7196-7344
/code/branches/network4/src/modules/portals:7497-7755
/code/branches/network5/src/modules/portals:7757-7781
/code/branches/network6/src/modules/portals:7823-8315
/code/branches/network64/src/modules/portals:2210-2355
/code/branches/newlevel2012/src/modules/portals:9033-9240
/code/branches/notifications/src/modules/portals:7314-7401
/code/branches/objecthierarchy/src/modules/portals:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/portals:2171-2479
/code/branches/ois_update/src/modules/portals:7506-7788
/code/branches/output/src/modules/portals:8739-8857
/code/branches/overlay/src/modules/portals:2117-2385
/code/branches/particles/src/modules/portals:2829-3085
/code/branches/particles2/src/modules/portals:6050-6106,6109
/code/branches/pch/src/modules/portals:3113-3194
/code/branches/physics/src/modules/portals:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/portals:2436-2457
/code/branches/pickup/src/modules/portals:8145-8555
/code/branches/pickup2/src/modules/portals:5942-6405
/code/branches/pickup2012/src/modules/portals:9029-9189
/code/branches/pickup3/src/modules/portals:6418-6523
/code/branches/pickup4/src/modules/portals:6594-6710
/code/branches/pickups/src/modules/portals:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/portals:2107-2497,2915-3071
/code/branches/png2/src/modules/portals:7262-7263
/code/branches/portals/src/modules/portals:8087-8455
/code/branches/portals2/src/modules/portals:8460-8602
/code/branches/ppspickups1/src/modules/portals:6552-6708
/code/branches/ppspickups2/src/modules/portals:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/portals:6757-6997
/code/branches/ppspickups4/src/modules/portals:7003-7089
/code/branches/presentation/src/modules/portals:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/portals:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/portals:8974-9015
/code/branches/presentation3/src/modules/portals:6913-7162
/code/branches/questsystem/src/modules/portals:1894-2088
/code/branches/questsystem2/src/modules/portals:2107-2259
/code/branches/questsystem5/src/modules/portals:2776-2905
/code/branches/releasetodo/src/modules/portals:7614-7647
/code/branches/resource/src/modules/portals:3327-3366
/code/branches/resource2/src/modules/portals:3372-5694
/code/branches/rocket/src/modules/portals:6523-6950
/code/branches/rocket2/src/modules/portals:6953-6970
/code/branches/script_trigger/src/modules/portals:1295-1953,1955
/code/branches/shipSelection/src/modules/portals:9038-9206
/code/branches/skybox2/src/modules/portals:6559-6989
/code/branches/sound/src/modules/portals:2829-3010
/code/branches/sound2012/src/modules/portals:9205-9240
/code/branches/sound3/src/modules/portals:5941-6102
/code/branches/spaceboundaries/src/modules/portals:8085-8457
/code/branches/spaceboundaries2/src/modules/portals:8460-8613
/code/branches/spacegate/src/modules/portals:9030-9215
/code/branches/spacerace/src/modules/portals:8182-8630
/code/branches/spaceraceTwo/src/modules/portals:8881-8996
/code/branches/steering/src/modules/portals:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/portals:9028-9199
/code/branches/tetris/src/modules/portals:8100-8563
/code/branches/tutoriallevel/src/modules/portals:7827-8370
/code/branches/tutoriallevel2/src/modules/portals:8370-8452
/code/branches/tutoriallevel3/src/modules/portals:8453-8636
/code/branches/unity_build/src/modules/portals:8440-8716
/code/branches/usability/src/modules/portals:7915-8078
/code/branches/weapon/src/modules/portals:1925-2094
/code/branches/weapon2/src/modules/portals:2107-2488
/code/branches/weapons/src/modules/portals:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/portals:2742-2890
/code/trunk/src/modules/portals:9189-9204
Property changes on: code/branches/presentation2012/src/modules/questsystem
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/questsystem:6592-7033
/code/branches/ai2/src/modules/questsystem:8721-8880
/code/branches/bigships/src/modules/questsystem:8137-8588
/code/branches/buildsystem/src/modules/questsystem:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/questsystem:2506-2658
/code/branches/buildsystem3/src/modules/questsystem:2662-2708
/code/branches/ceguilua/src/modules/questsystem:1802-1808
/code/branches/chat/src/modules/questsystem:6527-6797
/code/branches/chat2/src/modules/questsystem:6836-6910
/code/branches/console/src/modules/questsystem:5941-6104
/code/branches/consolecommands2/src/modules/questsystem:6451-7178
/code/branches/consolecommands3/src/modules/questsystem:7178-7283
/code/branches/core3/src/modules/questsystem:1572-1739
/code/branches/core4/src/modules/questsystem: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/src/modules/questsystem:5768-5928,6009
/code/branches/data_cleanup/src/modules/questsystem:7537-7686
/code/branches/doc/src/modules/questsystem:7290-7400
/code/branches/dockingsystem/src/modules/questsystem:8101-8192
/code/branches/dockingsystem2/src/modules/questsystem:8196-8560
/code/branches/dynamicmatch/src/modules/questsystem:6584-7030
/code/branches/environment3/src/modules/questsystem:8887-8975
/code/branches/formation/src/modules/questsystem:8885-8991
/code/branches/fps/src/modules/questsystem:6591-7072
/code/branches/gamecontent/src/modules/questsystem:8893-8968
/code/branches/gameimmersion/src/modules/questsystem:8102-8577
/code/branches/gamestate/src/modules/questsystem:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/questsystem:6594-6745
/code/branches/gametypes/src/modules/questsystem:2826-3031
/code/branches/gcc43/src/modules/questsystem:1580
/code/branches/gui/src/modules/questsystem:1635-1723,2795-2894
/code/branches/hud/src/modules/questsystem:8883-8986
/code/branches/hudelements/src/modules/questsystem:6584-6941
/code/branches/hudimprovements/src/modules/questsystem:7920-8672
/code/branches/ingamemenu/src/modules/questsystem:6000-6023
/code/branches/input/src/modules/questsystem:1629-1636
/code/branches/ipv6/src/modules/questsystem:7293-7458
/code/branches/kicklib/src/modules/questsystem:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/questsystem:8282-8350
/code/branches/lastmanstanding/src/modules/questsystem:7479-7644
/code/branches/lastmanstanding3/src/modules/questsystem:7903-8175
/code/branches/libraries/src/modules/questsystem:5612-5692
/code/branches/libraries2/src/modules/questsystem:5703-5737
/code/branches/lod/src/modules/questsystem:6586-6911
/code/branches/lodfinal/src/modules/questsystem:2372-2411
/code/branches/mac_osx/src/modules/questsystem:7789-8128,8135
/code/branches/map/src/modules/questsystem:2801-3086,3089
/code/branches/masterserver/src/modules/questsystem:7502-7738
/code/branches/masterserverfix/src/modules/questsystem:8933-8936
/code/branches/menu/src/modules/questsystem:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/questsystem:8884-8976
/code/branches/miniprojects/src/modules/questsystem:2754-2824
/code/branches/netp2/src/modules/questsystem:2835-2988
/code/branches/netp3/src/modules/questsystem:2988-3082
/code/branches/netp6/src/modules/questsystem:3214-3302
/code/branches/network/src/modules/questsystem:2356
/code/branches/network2/src/modules/questsystem:6434-6465
/code/branches/network3/src/modules/questsystem:7196-7344
/code/branches/network4/src/modules/questsystem:7497-7755
/code/branches/network5/src/modules/questsystem:7757-7781
/code/branches/network6/src/modules/questsystem:7823-8315
/code/branches/network64/src/modules/questsystem:2210-2355
/code/branches/newlevel2012/src/modules/questsystem:9033-9240
/code/branches/notifications/src/modules/questsystem:7314-7401
/code/branches/objecthierarchy/src/modules/questsystem:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/questsystem:2171-2479
/code/branches/ois_update/src/modules/questsystem:7506-7788
/code/branches/output/src/modules/questsystem:8739-8857
/code/branches/overlay/src/modules/questsystem:2117-2385
/code/branches/particles/src/modules/questsystem:2829-3085
/code/branches/particles2/src/modules/questsystem:6050-6106,6109
/code/branches/pch/src/modules/questsystem:3113-3194
/code/branches/physics/src/modules/questsystem:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/questsystem:2436-2457
/code/branches/pickup/src/modules/questsystem:8145-8555
/code/branches/pickup2/src/modules/questsystem:5942-6405
/code/branches/pickup2012/src/modules/questsystem:9029-9189
/code/branches/pickup3/src/modules/questsystem:6418-6523
/code/branches/pickup4/src/modules/questsystem:6594-6710
/code/branches/pickups/src/modules/questsystem:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/questsystem:2107-2497,2915-3071
/code/branches/png2/src/modules/questsystem:7262-7263
/code/branches/portals/src/modules/questsystem:8087-8455
/code/branches/portals2/src/modules/questsystem:8460-8602
/code/branches/ppspickups1/src/modules/questsystem:6552-6708
/code/branches/ppspickups2/src/modules/questsystem:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/questsystem:6757-6997
/code/branches/ppspickups4/src/modules/questsystem:7003-7089
/code/branches/presentation/src/modules/questsystem:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/questsystem:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/questsystem:8974-9015
/code/branches/presentation3/src/modules/questsystem:6913-7162
/code/branches/questsystem/src/modules/questsystem:1894-2088
/code/branches/questsystem2/src/modules/questsystem:2107-2259
/code/branches/questsystem5/src/modules/questsystem:2776-2905
/code/branches/releasetodo/src/modules/questsystem:7614-7647
/code/branches/resource/src/modules/questsystem:3327-3366
/code/branches/resource2/src/modules/questsystem:3372-5694
/code/branches/rocket/src/modules/questsystem:6523-6950
/code/branches/rocket2/src/modules/questsystem:6953-6970
/code/branches/script_trigger/src/modules/questsystem:1295-1953,1955
/code/branches/shipSelection/src/modules/questsystem:9038-9206
/code/branches/skybox2/src/modules/questsystem:6559-6989
/code/branches/sound/src/modules/questsystem:2829-3010
/code/branches/sound2012/src/modules/questsystem:9205-9240
/code/branches/sound3/src/modules/questsystem:5941-6102
/code/branches/spaceboundaries/src/modules/questsystem:8085-8457
/code/branches/spaceboundaries2/src/modules/questsystem:8460-8613
/code/branches/spacegate/src/modules/questsystem:9030-9215
/code/branches/spacerace/src/modules/questsystem:8182-8630
/code/branches/spaceraceTwo/src/modules/questsystem:8881-8996
/code/branches/steering/src/modules/questsystem:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/questsystem:9028-9199
/code/branches/tetris/src/modules/questsystem:8100-8563
/code/branches/tutoriallevel/src/modules/questsystem:7827-8370
/code/branches/tutoriallevel2/src/modules/questsystem:8370-8452
/code/branches/tutoriallevel3/src/modules/questsystem:8453-8636
/code/branches/unity_build/src/modules/questsystem:8440-8716
/code/branches/usability/src/modules/questsystem:7915-8078
/code/branches/weapon/src/modules/questsystem:1925-2094
/code/branches/weapon2/src/modules/questsystem:2107-2488
/code/branches/weapons/src/modules/questsystem:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/questsystem:2742-2890
/code/trunk/src/modules/questsystem:9189-9204
Property changes on: code/branches/presentation2012/src/modules/tetris
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/tetris:6592-7033
/code/branches/ai2/src/modules/tetris:8721-8880
/code/branches/bigships/src/modules/tetris:8137-8588
/code/branches/buildsystem/src/modules/tetris:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/tetris:2506-2658
/code/branches/buildsystem3/src/modules/tetris:2662-2708
/code/branches/ceguilua/src/modules/tetris:1802-1808
/code/branches/chat/src/modules/tetris:6527-6797
/code/branches/chat2/src/modules/tetris:6836-6910
/code/branches/console/src/modules/tetris:5941-6104
/code/branches/consolecommands2/src/modules/tetris:6451-7178
/code/branches/consolecommands3/src/modules/tetris:7178-7283
/code/branches/core3/src/modules/tetris:1572-1739
/code/branches/core4/src/modules/tetris: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/src/modules/tetris:5768-5928,6009
/code/branches/data_cleanup/src/modules/tetris:7537-7686
/code/branches/doc/src/modules/tetris:7290-7400
/code/branches/dockingsystem/src/modules/tetris:8101-8192
/code/branches/dockingsystem2/src/modules/tetris:8196-8560
/code/branches/dynamicmatch/src/modules/tetris:6584-7030
/code/branches/environment3/src/modules/tetris:8887-8975
/code/branches/formation/src/modules/tetris:8885-8991
/code/branches/fps/src/modules/tetris:6591-7072
/code/branches/gamecontent/src/modules/tetris:8893-8968
/code/branches/gameimmersion/src/modules/tetris:8102-8577
/code/branches/gamestate/src/modules/tetris:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/tetris:6594-6745
/code/branches/gametypes/src/modules/tetris:2826-3031
/code/branches/gcc43/src/modules/tetris:1580
/code/branches/gui/src/modules/tetris:1635-1723,2795-2894
/code/branches/hud/src/modules/tetris:8883-8986
/code/branches/hudelements/src/modules/tetris:6584-6941
/code/branches/hudimprovements/src/modules/tetris:7920-8672
/code/branches/ingamemenu/src/modules/tetris:6000-6023
/code/branches/input/src/modules/tetris:1629-1636
/code/branches/ipv6/src/modules/tetris:7293-7458
/code/branches/kicklib/src/modules/tetris:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/tetris:8282-8350
/code/branches/lastmanstanding/src/modules/tetris:7479-7644
/code/branches/lastmanstanding3/src/modules/tetris:7903-8175
/code/branches/libraries/src/modules/tetris:5612-5692
/code/branches/libraries2/src/modules/tetris:5703-5737
/code/branches/lod/src/modules/tetris:6586-6911
/code/branches/lodfinal/src/modules/tetris:2372-2411
/code/branches/mac_osx/src/modules/tetris:7789-8128,8135
/code/branches/map/src/modules/tetris:2801-3086,3089
/code/branches/masterserver/src/modules/tetris:7502-7738
/code/branches/masterserverfix/src/modules/tetris:8933-8936
/code/branches/menu/src/modules/tetris:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/tetris:8884-8976
/code/branches/miniprojects/src/modules/tetris:2754-2824
/code/branches/netp2/src/modules/tetris:2835-2988
/code/branches/netp3/src/modules/tetris:2988-3082
/code/branches/netp6/src/modules/tetris:3214-3302
/code/branches/network/src/modules/tetris:2356
/code/branches/network2/src/modules/tetris:6434-6465
/code/branches/network3/src/modules/tetris:7196-7344
/code/branches/network4/src/modules/tetris:7497-7755
/code/branches/network5/src/modules/tetris:7757-7781
/code/branches/network6/src/modules/tetris:7823-8315
/code/branches/network64/src/modules/tetris:2210-2355
/code/branches/newlevel2012/src/modules/tetris:9033-9240
/code/branches/notifications/src/modules/tetris:7314-7401
/code/branches/objecthierarchy/src/modules/tetris:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/tetris:2171-2479
/code/branches/ois_update/src/modules/tetris:7506-7788
/code/branches/output/src/modules/tetris:8739-8857
/code/branches/overlay/src/modules/tetris:2117-2385
/code/branches/particles/src/modules/tetris:2829-3085
/code/branches/particles2/src/modules/tetris:6050-6106,6109
/code/branches/pch/src/modules/tetris:3113-3194
/code/branches/physics/src/modules/tetris:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/tetris:2436-2457
/code/branches/pickup/src/modules/tetris:8145-8555
/code/branches/pickup2/src/modules/tetris:5942-6405
/code/branches/pickup2012/src/modules/tetris:9029-9189
/code/branches/pickup3/src/modules/tetris:6418-6523
/code/branches/pickup4/src/modules/tetris:6594-6710
/code/branches/pickups/src/modules/tetris:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/tetris:2107-2497,2915-3071
/code/branches/png2/src/modules/tetris:7262-7263
/code/branches/portals/src/modules/tetris:8087-8455
/code/branches/portals2/src/modules/tetris:8460-8602
/code/branches/ppspickups1/src/modules/tetris:6552-6708
/code/branches/ppspickups2/src/modules/tetris:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/tetris:6757-6997
/code/branches/ppspickups4/src/modules/tetris:7003-7089
/code/branches/presentation/src/modules/tetris:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/tetris:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/tetris:8974-9015
/code/branches/presentation3/src/modules/tetris:6913-7162
/code/branches/questsystem/src/modules/tetris:1894-2088
/code/branches/questsystem2/src/modules/tetris:2107-2259
/code/branches/questsystem5/src/modules/tetris:2776-2905
/code/branches/releasetodo/src/modules/tetris:7614-7647
/code/branches/resource/src/modules/tetris:3327-3366
/code/branches/resource2/src/modules/tetris:3372-5694
/code/branches/rocket/src/modules/tetris:6523-6950
/code/branches/rocket2/src/modules/tetris:6953-6970
/code/branches/script_trigger/src/modules/tetris:1295-1953,1955
/code/branches/shipSelection/src/modules/tetris:9038-9206
/code/branches/skybox2/src/modules/tetris:6559-6989
/code/branches/sound/src/modules/tetris:2829-3010
/code/branches/sound2012/src/modules/tetris:9205-9240
/code/branches/sound3/src/modules/tetris:5941-6102
/code/branches/spaceboundaries/src/modules/tetris:8085-8457
/code/branches/spaceboundaries2/src/modules/tetris:8460-8613
/code/branches/spacegate/src/modules/tetris:9030-9215
/code/branches/spacerace/src/modules/tetris:8182-8630
/code/branches/spaceraceTwo/src/modules/tetris:8881-8996
/code/branches/steering/src/modules/tetris:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/tetris:9028-9199
/code/branches/tetris/src/modules/tetris:8100-8563
/code/branches/tutoriallevel/src/modules/tetris:7827-8370
/code/branches/tutoriallevel2/src/modules/tetris:8370-8452
/code/branches/tutoriallevel3/src/modules/tetris:8453-8636
/code/branches/unity_build/src/modules/tetris:8440-8716
/code/branches/usability/src/modules/tetris:7915-8078
/code/branches/weapon/src/modules/tetris:1925-2094
/code/branches/weapon2/src/modules/tetris:2107-2488
/code/branches/weapons/src/modules/tetris:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/tetris:2742-2890
/code/trunk/src/modules/tetris:9189-9204
Property changes on: code/branches/presentation2012/src/modules/weapons
___________________________________________________________________
Deleted: svn:mergeinfo
- /code/branches/ai/src/modules/weapons:6592-7033
/code/branches/ai2/src/modules/weapons:8721-8880
/code/branches/bigships/src/modules/weapons:8137-8588
/code/branches/buildsystem/src/modules/weapons:1874-2276,2278-2400
/code/branches/buildsystem2/src/modules/weapons:2506-2658
/code/branches/buildsystem3/src/modules/weapons:2662-2708
/code/branches/ceguilua/src/modules/weapons:1802-1808
/code/branches/chat/src/modules/weapons:6527-6797
/code/branches/chat2/src/modules/weapons:6836-6910
/code/branches/console/src/modules/weapons:5941-6104
/code/branches/consolecommands2/src/modules/weapons:6451-7178
/code/branches/consolecommands3/src/modules/weapons:7178-7283
/code/branches/core3/src/modules/weapons:1572-1739
/code/branches/core4/src/modules/weapons: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/src/modules/weapons:5768-5928,6009
/code/branches/data_cleanup/src/modules/weapons:7537-7686
/code/branches/doc/src/modules/weapons:7290-7400
/code/branches/dockingsystem/src/modules/weapons:8101-8192
/code/branches/dockingsystem2/src/modules/weapons:8196-8560
/code/branches/dynamicmatch/src/modules/weapons:6584-7030
/code/branches/environment3/src/modules/weapons:8887-8975
/code/branches/formation/src/modules/weapons:8885-8991
/code/branches/fps/src/modules/weapons:6591-7072
/code/branches/gamecontent/src/modules/weapons:8893-8968
/code/branches/gameimmersion/src/modules/weapons:8102-8577
/code/branches/gamestate/src/modules/weapons:6430-6572,6621-6661
/code/branches/gamestates2/src/modules/weapons:6594-6745
/code/branches/gametypes/src/modules/weapons:2826-3031
/code/branches/gcc43/src/modules/weapons:1580
/code/branches/gui/src/modules/weapons:1635-1723,2795-2894
/code/branches/hud/src/modules/weapons:8883-8986
/code/branches/hudelements/src/modules/weapons:6584-6941
/code/branches/hudimprovements/src/modules/weapons:7920-8672
/code/branches/ingamemenu/src/modules/weapons:6000-6023
/code/branches/input/src/modules/weapons:1629-1636
/code/branches/ipv6/src/modules/weapons:7293-7458
/code/branches/kicklib/src/modules/weapons:7940-8096,8098-8277
/code/branches/kicklib2/src/modules/weapons:8282-8350
/code/branches/lastmanstanding/src/modules/weapons:7479-7644
/code/branches/lastmanstanding3/src/modules/weapons:7903-8175
/code/branches/libraries/src/modules/weapons:5612-5692
/code/branches/libraries2/src/modules/weapons:5703-5737
/code/branches/lod/src/modules/weapons:6586-6911
/code/branches/lodfinal/src/modules/weapons:2372-2411
/code/branches/mac_osx/src/modules/weapons:7789-8128,8135
/code/branches/map/src/modules/weapons:2801-3086,3089
/code/branches/masterserver/src/modules/weapons:7502-7738
/code/branches/masterserverfix/src/modules/weapons:8933-8936
/code/branches/menu/src/modules/weapons:5941-6146,6148,7536-7687
/code/branches/menue/src/modules/weapons:8884-8976
/code/branches/miniprojects/src/modules/weapons:2754-2824
/code/branches/netp2/src/modules/weapons:2835-2988
/code/branches/netp3/src/modules/weapons:2988-3082
/code/branches/netp6/src/modules/weapons:3214-3302
/code/branches/network/src/modules/weapons:2356
/code/branches/network2/src/modules/weapons:6434-6465
/code/branches/network3/src/modules/weapons:7196-7344
/code/branches/network4/src/modules/weapons:7497-7755
/code/branches/network5/src/modules/weapons:7757-7781
/code/branches/network6/src/modules/weapons:7823-8315
/code/branches/network64/src/modules/weapons:2210-2355
/code/branches/newlevel2012/src/modules/weapons:9033-9240
/code/branches/notifications/src/modules/weapons:7314-7401
/code/branches/objecthierarchy/src/modules/weapons:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2/src/modules/weapons:2171-2479
/code/branches/ois_update/src/modules/weapons:7506-7788
/code/branches/output/src/modules/weapons:8739-8857
/code/branches/overlay/src/modules/weapons:2117-2385
/code/branches/particles/src/modules/weapons:2829-3085
/code/branches/particles2/src/modules/weapons:6050-6106,6109
/code/branches/pch/src/modules/weapons:3113-3194
/code/branches/physics/src/modules/weapons:1912-2055,2107-2439
/code/branches/physics_merge/src/modules/weapons:2436-2457
/code/branches/pickup/src/modules/weapons:8145-8555
/code/branches/pickup2/src/modules/weapons:5942-6405
/code/branches/pickup2012/src/modules/weapons:9029-9189
/code/branches/pickup3/src/modules/weapons:6418-6523
/code/branches/pickup4/src/modules/weapons:6594-6710
/code/branches/pickups/src/modules/weapons:1926-2086,2127,2827-2915
/code/branches/pickups2/src/modules/weapons:2107-2497,2915-3071
/code/branches/png2/src/modules/weapons:7262-7263
/code/branches/portals/src/modules/weapons:8087-8455
/code/branches/portals2/src/modules/weapons:8460-8602
/code/branches/ppspickups1/src/modules/weapons:6552-6708
/code/branches/ppspickups2/src/modules/weapons:6527-6532,6554-6709
/code/branches/ppspickups3/src/modules/weapons:6757-6997
/code/branches/ppspickups4/src/modules/weapons:7003-7089
/code/branches/presentation/src/modules/weapons:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2/src/modules/weapons:6106-6416,7787-7800
/code/branches/presentation2011/src/modules/weapons:8974-9015
/code/branches/presentation3/src/modules/weapons:6913-7162
/code/branches/questsystem/src/modules/weapons:1894-2088
/code/branches/questsystem2/src/modules/weapons:2107-2259
/code/branches/questsystem5/src/modules/weapons:2776-2905
/code/branches/releasetodo/src/modules/weapons:7614-7647
/code/branches/resource/src/modules/weapons:3327-3366
/code/branches/resource2/src/modules/weapons:3372-5694
/code/branches/rocket/src/modules/weapons:6523-6950
/code/branches/rocket2/src/modules/weapons:6953-6970
/code/branches/script_trigger/src/modules/weapons:1295-1953,1955
/code/branches/shipSelection/src/modules/weapons:9038-9206
/code/branches/skybox2/src/modules/weapons:6559-6989
/code/branches/sound/src/modules/weapons:2829-3010
/code/branches/sound2012/src/modules/weapons:9205-9240
/code/branches/sound3/src/modules/weapons:5941-6102
/code/branches/spaceboundaries/src/modules/weapons:8085-8457
/code/branches/spaceboundaries2/src/modules/weapons:8460-8613
/code/branches/spacegate/src/modules/weapons:9030-9215
/code/branches/spacerace/src/modules/weapons:8182-8630
/code/branches/spaceraceTwo/src/modules/weapons:8881-8996
/code/branches/steering/src/modules/weapons:5949-6091,8140-8595
/code/branches/surfaceRace/src/modules/weapons:9028-9199
/code/branches/tetris/src/modules/weapons:8100-8563
/code/branches/tutoriallevel/src/modules/weapons:7827-8370
/code/branches/tutoriallevel2/src/modules/weapons:8370-8452
/code/branches/tutoriallevel3/src/modules/weapons:8453-8636
/code/branches/unity_build/src/modules/weapons:8440-8716
/code/branches/usability/src/modules/weapons:7915-8078
/code/branches/weapon/src/modules/weapons:1925-2094
/code/branches/weapon2/src/modules/weapons:2107-2488
/code/branches/weapons/src/modules/weapons:2897-3051,8143-8591
/code/branches/weaponsystem/src/modules/weapons:2742-2890
/code/trunk/src/modules/weapons:9189-9204
More information about the Orxonox-commit
mailing list