Changeset 9008 in orxonox.OLD for trunk/src/util/object_manager.cc

Timestamp:

Jul 2, 2006, 2:22:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network bak to the trunk
merged with command:
svn merge -r8804:HEAD ​https://svn.orxonox.net/orxonox/branches/multi_player_map .

conflicts all resolved in favour of the branche

File:

• trunk/src/util/object_manager.cc (modified) (1 diff)

trunk/src/util/object_manager.cc

@@ -212 +212 @@
     "background",
     "common",
+
+    "players",
+    "players-proj",
 
     "group00",