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

Timestamp:

Jun 20, 2006, 1:39:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

File:

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

trunk/src/lib/network/Makefile.am

@@ -24 +24 @@
                       zip.cc \
                       player_stats.cc \
+                      udp_broadcast.cc \
                       \
                       synchronizeable_var/synchronizeable_var.cc \
@@ -58 +59 @@
                  zip.h \
                  player_stats.h \
+                 udp_broadcast.h \
                  \
                  synchronizeable_var/synchronizeable_var.h \