Changeset 5961 in orxonox.OLD for branches/avi_play/src/util/loading

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/util/loading

Files:

• factory.h (modified) (1 diff)
• resource_manager.cc (modified) (1 diff)

branches/avi_play/src/util/loading/factory.h

@@ -25 +25 @@
 class BaseObject;
 
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 #include "base_object.h"
 #include "debug.h"

branches/avi_play/src/util/loading/resource_manager.cc

@@ -33 +33 @@
 #endif /* NO_TEXT */
 #ifndef NO_AUDIO
-#include "sound_engine.h"
+#include "sound_buffer.h"
 #include "ogg_player.h"
 #endif /* NO_AUDIO */