Changeset 5750 in orxonox.OLD for trunk/src/world_entities/Makefile.am

Timestamp:

Nov 24, 2005, 12:13:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:

• trunk/src/world_entities/Makefile.am (modified) (1 diff)

trunk/src/world_entities/Makefile.am

@@ -25 +25 @@
                   weapons/rocket.cc \
                   weapons/laser.cc \
+                  weapons/ground_turret.cc \
                   weapons/crosshair.cc \
+                  weapons/ground_turret.cc \
                   power_ups/power_up.cc \
                   power_ups/turret_power_up.cc \