Changeset 5955 in orxonox.OLD for branches/powerups/src/util

Timestamp:

Dec 7, 2005, 1:05:10 PM (19 years ago)

Author:

bensch

Message:

branches/powerups: merged the trunk to branches/powerup
merged with commandsvn merge ../trunk/ powerups/ -r5848:HEAD
conflicts resolved in favor of the trunk

Location:

branches/powerups/src/util

Files:

• loading/factory.h (modified) (1 diff)
• loading/resource_manager.cc (modified) (1 diff)
• track/track_manager.cc (modified) (1 diff)

branches/powerups/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/powerups/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 */

branches/powerups/src/util/track/track_manager.cc

@@ -28 +28 @@
 
 
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 #include "substring.h"