Changeset 7034 for code/branches/presentation3/src/modules
- Timestamp:
- May 31, 2010, 5:31:50 AM (14 years ago)
- Location:
- code/branches/presentation3
- Files:
-
- 3 edited
- 2 copied
-
. (modified) (1 prop)
-
src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
-
src/modules/pickup/items/CMakeLists.txt (modified) (1 diff)
-
src/modules/pickup/items/DronePickup.cc (copied) (copied from code/branches/ai/src/modules/pickup/items/DronePickup.cc) (1 prop)
-
src/modules/pickup/items/DronePickup.h (copied) (copied from code/branches/ai/src/modules/pickup/items/DronePickup.h) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3
- Property svn:mergeinfo changed
/code/branches/ai (added) merged: 6592,6601,6640,6683,6695-6696,6782,6795,6832-6833,6847,6850,6854,6888,6891,6918-6919,6958,6978,6986,6991,6997,7029,7033
- Property svn:mergeinfo changed
-
code/branches/presentation3/src/modules/pickup/PickupPrereqs.h
r6998 r7034 75 75 76 76 //items 77 class DronePickup; 77 78 class HealthPickup; 78 79 class InvisiblePickup; -
code/branches/presentation3/src/modules/pickup/items/CMakeLists.txt
r6998 r7034 3 3 InvisiblePickup.cc 4 4 MetaPickup.cc 5 DronePickup.cc 5 6 SpeedPickup.cc 6 7 ShieldPickup.cc -
code/branches/presentation3/src/modules/pickup/items/DronePickup.cc
- Property svn:eol-style set to native
-
code/branches/presentation3/src/modules/pickup/items/DronePickup.h
- Property svn:eol-style set to native
Note: See TracChangeset
for help on using the changeset viewer.
