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

Timestamp:

Dec 4, 2005, 3:34:36 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/spaceshipControll back to the trunk:
merged with command:
svn merge -r5835:HEAD branches/spaceshipcontroll trunk
conflicts resolved with dynamic indentation methodology algorithms

File:

• trunk/src/world_entities/Makefile.am (modified) (4 diffs)

trunk/src/world_entities/Makefile.am

@@ -7 +7 @@
                   world_entity.cc \
                   camera.cc \
-                  player.cc \
+                  playable.cc \
+                  player.cc \
                   npc.cc \
                   npc2.cc \
@@ -17 +18 @@
                   character_attributes.cc \
                   test_entity.cc \
+                  space_ships/space_ship.cc \
                   weapons/weapon_manager.cc \
                   weapons/weapon.cc \
@@ -35 +37 @@
                  world_entity.h \
                  camera.h \
-                 player.h \
+                 playable.h \
+                 player.h \
                  npc.h \
                  npc2.h \
@@ -45 +48 @@
                  character_attributes.h \
                  test_entity.h \
+                 space_ships/space_ship.h \
                  weapons/weapon_manager.h \
                  weapons/weapon.h \