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

Timestamp:

Dec 16, 2005, 7:13:57 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merge the ObjectManager to the trunk
merged with command:
svn merge -r6082:HEAD objectmanager/ ../trunk/

conflicts resolution was easy this time
but specially merged the world to network_world

File:

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

trunk/src/util/Makefile.am

@@ -7 +7 @@
                         object_manager.cc \
                         loading/factory.cc \
-                        garbage_collector.cc \
                         state.cc \
                         user_control.cc \
@@ -19 +18 @@
                         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 \
                         user_control.h \