Changeset 3365 in orxonox.OLD for orxonox/trunk/src/stdincl.h

Timestamp:

Jan 7, 2005, 1:14:33 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/parenting back to the.
merged with command:
svn merge branches/parenting trunk -r 3247:HEAD
resolved all conflicts in favor of parenting.

File:

• orxonox/trunk/src/stdincl.h (modified) (3 diffs)

orxonox/trunk/src/stdincl.h

@@ -10 +10 @@
 
 #define null 0   //!< null
+
+typedef unsigned char byte;
 
 // this includes the information from configure/makefiles
@@ -31 +33 @@
 
 #include "vector.h"
-#include "coordinates.h"
+#include "matrix.h"
+#include "curve.h"
+//#include "coordinates.h"
 #include "list.h"
 #include "list_template.h"
@@ -38 +42 @@
 #include "message_structures.h"
 #include "orxonox.h"
+#include "data_tank.h"
+#include "base_object.h"
 
 #endif /* _STDINCL_H */