Changeset 5721 for code/branches/libraries2/src/modules/questsystem/notifications/NotificationOverlay.cc
- Timestamp:
- Aug 31, 2009, 5:18:51 PM (15 years ago)
- File:
-
- 1 moved
-
code/branches/libraries2/src/modules/questsystem
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/core4/src/orxonox/objects/quest merged eligible /code/branches/libraries/src/orxonox/objects/quest merged eligible /code/branches/netp6/src/orxonox/objects/quest merged eligible /code/branches/resource/src/orxonox/objects/quest merged eligible /code/branches/resource2/src/orxonox/objects/quest merged eligible /code/branches/buildsystem/src/orxonox/objects/quest 1874-2276,2278-2400 /code/branches/buildsystem2/src/orxonox/objects/quest 2506-2658 /code/branches/buildsystem3/src/orxonox/objects/quest 2662-2708 /code/branches/ceguilua/src/orxonox/objects/quest 1802-1808 /code/branches/core3/src/orxonox/objects/quest 1572-1739 /code/branches/gametypes/src/orxonox/objects/quest 2826-3031 /code/branches/gcc43/src/orxonox/objects/quest 1580 /code/branches/gui/src/orxonox/objects/quest 1635-1723,2795-2894 /code/branches/input/src/orxonox/objects/quest 1629-1636 /code/branches/lodfinal/src/orxonox/objects/quest 2372-2411 /code/branches/map/src/orxonox/objects/quest 2801-3086,3089 /code/branches/miniprojects/src/orxonox/objects/quest 2754-2824 /code/branches/netp2/src/orxonox/objects/quest 2835-2988 /code/branches/netp3/src/orxonox/objects/quest 2988-3082 /code/branches/network/src/orxonox/objects/quest 2356 /code/branches/network64/src/orxonox/objects/quest 2210-2355 /code/branches/objecthierarchy/src/orxonox/objects/quest 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/orxonox/objects/quest 2171-2479 /code/branches/overlay/src/orxonox/objects/quest 2117-2385 /code/branches/particles/src/orxonox/objects/quest 2829-3085 /code/branches/pch/src/orxonox/objects/quest 3113-3194 /code/branches/physics/src/orxonox/objects/quest 1912-2055,2107-2439 /code/branches/physics_merge/src/orxonox/objects/quest 2436-2457 /code/branches/pickups/src/orxonox/objects/quest 1926-2086,2127,2827-2915 /code/branches/pickups2/src/orxonox/objects/quest 2107-2497,2915-3071 /code/branches/presentation/src/orxonox/objects/quest 2369-2652,2654-2660 /code/branches/questsystem/src/orxonox/objects/quest 1894-2088 /code/branches/questsystem2/src/orxonox/objects/quest 2107-2259 /code/branches/questsystem5/src/orxonox/objects/quest 2776-2905 /code/branches/script_trigger/src/orxonox/objects/quest 1295-1953,1955 /code/branches/sound/src/orxonox/objects/quest 2829-3010 /code/branches/weapon/src/orxonox/objects/quest 1925-2094 /code/branches/weapon2/src/orxonox/objects/quest 2107-2488 /code/branches/weapons/src/orxonox/objects/quest 2897-3051 /code/branches/weaponsystem/src/orxonox/objects/quest 2742-2890
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.