Changeset 6340 in orxonox.OLD for branches/network_merged/src/util/loading/factory.cc

Timestamp:

Dec 30, 2005, 1:52:26 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/newtork: merged the network branche for merging to the trunk
confilcts maily resolved in favor of trunk with some minor fixes

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6146:HEAD

File:

• branches/network_merged/src/util/loading/factory.cc (modified) (1 diff)

branches/network_merged/src/util/loading/factory.cc

@@ -155 +155 @@
 }
 
+
 /**
  * Creates a new Object of type classID