Changeset 6426 in orxonox.OLD for trunk/src/Makefile.am

Timestamp:

Jan 7, 2006, 11:17:51 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the spaceshipcontrol branche back to the trunk

merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/spaceshipcontrol . -r6224:HEAD
small conflict in space_ship.cc fixed in favor of the control

File:

• trunk/src/Makefile.am (modified) (2 diffs)

trunk/src/Makefile.am

@@ -76 +76 @@
                   world_entities/weapons/ground_turret.cc \
                   world_entities/weapons/aiming_turret.cc \
+                  world_entities/weapons/targeting_turret.cc \
                   world_entities/weapons/cannon.cc \
                   world_entities/weapons/test_bullet.cc \
@@ -130 +131 @@
                  world_entities/weapons/turret.h \
                  world_entities/weapons/aiming_turret.h \
+                 world_entities/weapons/targeting_turret.h \
                  world_entities/weapons/test_bullet.h \
                  world_entities/weapons/rocket.h \