Changeset 6424 in orxonox.OLD for trunk/src/lib/Makefile.am

Timestamp:

Jan 7, 2006, 11:07:22 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the branche network back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r 6351:HEAD
no conflicts

File:

• trunk/src/lib/Makefile.am (modified) (3 diffs)

trunk/src/lib/Makefile.am

@@ -36 +36 @@
                         lang/base_object.cc \
                         lang/class_list.cc \
+                        data/data_tank.cc \
                         util/substring.cc \
                         util/color.cc \
@@ -47 +48 @@
 noinst_HEADERS =        coord/p_node.h \
                         lang/base_object.h \
+                        data/data_tank.h \
                         graphics/render2D/element_2d.h \
                         graphics/render2D/render_2d.h \
@@ -70 +72 @@
           particles \
           collision_detection \
-          network \
+                network \
           parser \
           shell \