Changeset 5822 in orxonox.OLD for trunk/src/subprojects

Timestamp:

Nov 29, 2005, 2:22:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/network to the trunk
merged with command:
svn merge -r 5505:HEAD branches/network trunk

conflicts resolved in favor of the trunk (as always
also fixed a typo in the #include "SDL_tread.h"

Location:

trunk/src/subprojects

Files:

• Makefile.am (modified) (1 diff)
• network (copied) (copied from branches/network/src/subprojects/network)
• network/Makefile.am (copied) (copied from branches/network/src/subprojects/network/Makefile.am)
• network/Makefile.in (copied) (copied from branches/network/src/subprojects/network/Makefile.in) (3 diffs)
• network/README (copied) (copied from branches/network/src/subprojects/network/README)
• network/network_unit_test.cc (copied) (copied from branches/network/src/subprojects/network/network_unit_test.cc)
• network/network_unit_test.h (copied) (copied from branches/network/src/subprojects/network/network_unit_test.h)
• network/simple_sync.cc (copied) (copied from branches/network/src/subprojects/network/simple_sync.cc)
• network/simple_sync.h (copied) (copied from branches/network/src/subprojects/network/simple_sync.h)

trunk/src/subprojects/Makefile.am

@@ -2 +2 @@
           particles \
           collision_detection \
+          network \
           testmain
 

trunk/src/subprojects/network/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
@@ -15 +15 @@
 @SET_MAKE@
 
-
-SOURCES = $(network_SOURCES)
 
 srcdir = @srcdir@
@@ -43 +41 @@
 bin_PROGRAMS = network$(EXEEXT)
 subdir = src/subprojects/network
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4