Changeset 9406 in orxonox.OLD for trunk/src/world_entities/items

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/world_entities/items/item_container.cc (modified) (1 diff)

trunk/src/world_entities/items/item_container.cc

@@ -18 +18 @@
 #include "item_container.h"
 
-using namespace std;
+