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

Timestamp:

Nov 29, 2005, 2:22:37 PM (18 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"

File:

• trunk/src/subprojects/Makefile.am (modified) (1 diff)

trunk/src/subprojects/Makefile.am

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