Changeset 9406 in orxonox.OLD for trunk/src/lib/network/converter.cc

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/lib/network/converter.cc (modified) (3 diffs)

trunk/src/lib/network/converter.cc

@@ -10 +10 @@
 
 ### File Specific:
-   main-programmer: Benjamin Wuest
-   co-programmer: ...
+   main-programmer: Benjamin Wuest (bwuest@ee.ethz.ch)
+   co-programmer: Christoph Renner (rennerc@ee.ethz.ch)
 */
 
@@ -30 +30 @@
 
 /* using namespace std is default, this needs to be here */
-using namespace std;
+
 
 /*!
@@ -38 +38 @@
 {
   /* set the class id for the base object */
-  //this->setClassID(CL_ENTITY_MANAGER, "EntityManager");
 }