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

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

File:

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

trunk/src/lib/network/Makefile.am

@@ -27 +27 @@
                       \
                       proxy/network_settings.cc \
+                      proxy/proxy_control.cc \
                       \
                       monitor/connection_monitor.cc \
@@ -76 +77 @@
                 udp_broadcast.h \
                 \
-                proxy/network_settings.cc \
+                proxy/network_settings.h \
+                proxy/proxy_control.h \
                 \
                 monitor/connection_monitor.h \