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

Timestamp:

May 19, 2005, 7:45:28 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged back the Trunk into the Physics-branche
merged with command:
svn merge -r 4178:HEAD ../trunk/ physics
no conflicts in relevant files

File:

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

orxonox/branches/physics/src/Makefile.am

@@ -83 +83 @@
                  lib/lang/base_object.cc \
                  lib/util/ini_parser.cc \
+                 lib/util/substring.cc \
                  util/common/list.cc \
                  util/resource_manager.cc \
@@ -167 +168 @@
                  util/physics/fields/twirl.h \
                  lib/util/ini_parser.h \
+                 lib/util/substring.h \
                  lib/math/vector.h \
                  lib/math/curve.h \