Changeset 5961 in orxonox.OLD for branches/avi_play/src/subprojects/framework.cc

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/

File:

• branches/avi_play/src/subprojects/framework.cc (modified) (1 diff)

branches/avi_play/src/subprojects/framework.cc

@@ -24 +24 @@
 #include "resource_manager.h"
 #include "camera.h"
-#include "ini_parser.h"
+#include "parser/ini_parser/ini_parser.h"
 #include "globals.h"