Changeset 3399 in orxonox.OLD for orxonox/branches/nico/src/stdincl.h

Timestamp:

Feb 6, 2005, 11:27:25 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/nico: merged trunk into branches/nico
merged with command:
svn merge ../trunk/ nico/ -r 3238:HEAD
resolved conflict in favor of branches/nico.

Location:

orxonox/branches/nico

Files:

• . (modified) (1 prop)
• src/stdincl.h (modified) (3 diffs)

orxonox/branches/nico/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 */