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

Timestamp:

Dec 16, 2005, 6:45:32 PM (18 years ago)

Author:

patrick

Message:

trunk: merged branche network with trunk using command: svn merge -r5999:HEAD, conflicts resolved in favor of the trunk bla

File:

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

trunk/src/lib/network/Makefile.am

@@ -11 +11 @@
                       data_stream.cc \
                       network_protocol.cc \
-                      server_socket.cc
+                      server_socket.cc \
+                      handshake.cc \
+                      network_game_manager.cc \
+                      converter.cc
+
 
 
@@ -22 +26 @@
                  data_stream.h \
                  network_protocol.h \
-                 server_socket.h
+                 server_socket.h \
+                 handshake.h \
+                 network_game_manager.h \
+                 converter.h
 
+