Changeset 10616 for code/branches/presentationFS15merge/src/modules/weapons/munitions

Timestamp:

Oct 4, 2015, 12:20:35 PM (9 years ago)

Author:

landauf

Message:

merged branch weaponFS15 (but without changes in weaponSettingsAssff.oxi)

Location:

code/branches/presentationFS15merge

Files:

• . (modified) (1 prop)
• src/modules/weapons/munitions/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/munitions/GravityBombMunition.cc (copied) (copied from code/branches/weaponFS15/src/modules/weapons/munitions/GravityBombMunition.cc)
• src/modules/weapons/munitions/GravityBombMunition.h (copied) (copied from code/branches/weaponFS15/src/modules/weapons/munitions/GravityBombMunition.h)

code/branches/presentationFS15merge/src/modules/weapons/munitions/CMakeLists.txt

@@ -4 +4 @@
   FusionMunition.cc
   RocketMunition.cc
+  GravityBombMunition.cc
 )