Changeset 5961 in orxonox.OLD for branches/avi_play/src/lib/graphics

Timestamp:

Dec 7, 2005, 2:53:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/avi_play: merged the trunk back to the avi_play branche again
merged with command
svn merge -r 5924:HEAD ../trunk/ avi_play/

Location:

branches/avi_play/src/lib/graphics

Files:

• graphics_engine.cc (modified) (1 diff)
• light.cc (modified) (1 diff)
• render2D/element_2d.cc (modified) (1 diff)

branches/avi_play/src/lib/graphics/graphics_engine.cc

@@ -26 +26 @@
 #include "debug.h"
 
-#include "ini_parser.h"
+#include "parser/ini_parser/ini_parser.h"
 #include "substring.h"
 #include "text.h"

branches/avi_play/src/lib/graphics/light.cc

@@ -22 +22 @@
 #include "glincl.h"
 #include "vector.h"
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 #include "load_param.h"
 #include "factory.h"

branches/avi_play/src/lib/graphics/render2D/element_2d.cc

@@ -23 +23 @@
 #include "graphics_engine.h"
 #include "load_param.h"
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 #include "class_list.h"