Changeset 6634 in orxonox.OLD for trunk/src/lib/lang

Timestamp:

Jan 21, 2006, 1:18:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network-branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6500:HEAD
minor conflicts in texture and one Makefile resolved to the trunk

also made a small patch to texture, so it Modulates with GL_REPEAT

File:

• trunk/src/lib/lang/base_object.cc (modified) (1 diff)

trunk/src/lib/lang/base_object.cc

@@ -224 +224 @@
   SYNCHELP_WRITE_BEGIN();
 
+  //PRINTF(0)("objectname = %s\n", this->objectName);
   SYNCHELP_WRITE_STRING( this->objectName );