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

Timestamp:

Dec 30, 2005, 1:52:26 AM (18 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

Location:

branches/network_merged/src/util/loading

Files:

• factory.cc (modified) (1 diff)
• factory.h (modified) (1 diff)

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

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

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

@@ -29 +29 @@
 #include "debug.h"
 #include <vector>
+#include <list>
 
 /**