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

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

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

trunk/src/lib/util/Makefile.am

@@ -6 +6 @@
 libORXlibutil_a_SOURCES = \
                 substring.cc \
-                tokenizer.cc \
                 color.cc \
                 helper_functions.cc \
@@ -24 +23 @@
                 filesys/file.cc \
                 filesys/directory.cc \
+                filesys/net_link.cc \
                 \
                 preferences.cc \
@@ -32 +32 @@
 noinst_HEADERS = \
                 substring.h \
-                tokenizer.h \
                 multi_type.h \
                 color.h \
@@ -44 +43 @@
                 filesys/file.h \
                 filesys/directory.h \
+                filesys/net_link.h \
                 \
                 preferences.h \