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