Changeset 2983 for code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt

Timestamp:

May 18, 2009, 4:29:40 PM (15 years ago)

Author:

Hagen

Message:

MuzzleFlash finally there, EnergyDrink weapon

File:

• code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt (modified) (1 diff)

code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+  EnergyDrink.cc
   FusionFire.cc
   LaserFire.cc
-<<<<<<< .mine
   HsW01.cc
-=======
   LightningGun.cc
->>>>>>> .r2978
 )