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

Timestamp:

Dec 16, 2005, 6:45:32 PM (18 years ago)

Author:

patrick

Message:

trunk: merged branche network with trunk using command: svn merge -r5999:HEAD, conflicts resolved in favor of the trunk bla

File:

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

trunk/src/world_entities/Makefile.am

@@ -8 +8 @@
                   camera.cc \
                   playable.cc \
-                  player.cc \
+                              player.cc \
                   npc.cc \
                   npc2.cc \
@@ -18 +18 @@
                   character_attributes.cc \
                   test_entity.cc \
-                  space_ships/space_ship.cc \
+                              space_ships/space_ship.cc \
                   weapons/weapon_manager.cc \
                   weapons/weapon.cc \
@@ -27 +27 @@
                   weapons/rocket.cc \
                   weapons/laser.cc \
-                  weapons/ground_turret.cc \
+                              weapons/ground_turret.cc \
                   weapons/crosshair.cc \
-                  weapons/ground_turret.cc \
+                              weapons/ground_turret.cc \
                   power_ups/power_up.cc \
                   power_ups/turret_power_up.cc \
@@ -38 +38 @@
                  camera.h \
                  playable.h \
-                 player.h \
+                             player.h \
                  npc.h \
                  npc2.h \