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