Changeset 4283 in orxonox.OLD for orxonox/branches/physics/src/defs

Timestamp:

May 24, 2005, 10:32:34 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to branches/physics
merged with command
svn merge -r 4223:HEAD ../../trunk/ .
conflicts additively included

Location:

orxonox/branches/physics/src/defs

Files:

• keynames.cc (copied) (copied from orxonox/trunk/src/defs/keynames.cc)
• keynames.h (copied) (copied from orxonox/trunk/src/defs/keynames.h)
• message_structures.h (copied) (copied from orxonox/trunk/src/defs/message_structures.h)
• stdincl.h (modified) (1 diff)

orxonox/branches/physics/src/defs/stdincl.h

@@ -28 +28 @@
 
 #include "compiler.h"
-#include "xmlparser/tinyxml.h"
-#include "factory.h"
 
 #endif /* _STDINCL_H */