Changeset 4332 in orxonox.OLD for orxonox/branches/physics/src/Makefile.am

Timestamp:

May 27, 2005, 7:14:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

File:

• orxonox/branches/physics/src/Makefile.am (modified) (5 diffs)

orxonox/branches/physics/src/Makefile.am

@@ -81 +81 @@
                  lib/coord/null_parent.cc \
                  lib/coord/helper_parent.cc \
+                 lib/coord/pilot_node.cc \
                  lib/graphics/graphics_engine.cc \
                  lib/graphics/light.cc \
@@ -94 +95 @@
                  lib/graphics/particles/particle_system.cc \
                  lib/graphics/particles/particle_emitter.cc \
-                 lib/lang/base_entity.cc \
                  lib/lang/base_object.cc \
                  lib/util/ini_parser.cc \
@@ -107 +107 @@
                  defs/keynames.h \
                  command_node.h \
+                 action_listener.h \
                  defs/message_structures.h \
                  util/loading/game_loader.h \
@@ -151 +152 @@
                  lib/coord/null_parent.h \
                  lib/coord/helper_parent.h \
+                 lib/coord/pilot_node.h \
                  lib/graphics/graphics_engine.h \
                  lib/graphics/light.h \
@@ -165 +167 @@
                  lib/graphics/particles/particle_system.h \
                  lib/graphics/particles/particle_emitter.h \
-                 lib/lang/base_entity.h \
                  lib/lang/base_object.h \
                  util/common/list.h \