Changeset 5750 in orxonox.OLD for trunk/src/util/Makefile.am

Timestamp:

Nov 24, 2005, 12:13:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:

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

trunk/src/util/Makefile.am

@@ -5 +5 @@
 
 libORXutils_a_SOURCES = fast_factory.cc \
+                        object_manager.cc \
                         loading/factory.cc \
                         garbage_collector.cc \
@@ -18 +19 @@
                         track/pilot_node.cc \
                         track/track_manager.cc \
-                        track/track_node.cc
+                        track/track_node.cc 
 
 noinst_HEADERS =        fast_factory.h \
+                        object_manager.h \
                         garbage_collector.h \
                         state.h \