Changeset 6709 for code/trunk/src/modules/pickup/items

Timestamp:

Apr 13, 2010, 9:32:08 AM (15 years ago)

Author:

dafrick

Message:

Merged ppspickups1 into trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/items/HealthPickup.cc (modified) (1 prop)
• src/modules/pickup/items/HealthPickup.h (modified) (1 prop)
• src/modules/pickup/items/MetaPickup.cc (modified) (1 prop)
• src/modules/pickup/items/MetaPickup.h (modified) (1 prop)
• src/modules/pickup/items/SpeedPickup.cc (copied) (copied from code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc)
• src/modules/pickup/items/SpeedPickup.h (copied) (copied from code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h)

code/trunk/src/modules/pickup/items/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(PICKUP_SRC_FILES
+
   HealthPickup.cc
+
+  SpeedPickup.cc
   MetaPickup.cc
+
 )