Changeset 5955 in orxonox.OLD for branches/powerups/src/world_entities/Makefile.am

Timestamp:

Dec 7, 2005, 1:05:10 PM (18 years ago)

Author:

bensch

Message:

branches/powerups: merged the trunk to branches/powerup
merged with commandsvn merge ../trunk/ powerups/ -r5848:HEAD
conflicts resolved in favor of the trunk

File:

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

branches/powerups/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 \