Changeset 5955 in orxonox.OLD for branches/powerups/src/world_entities/weapons/cannon.cc

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

File:

• branches/powerups/src/world_entities/weapons/cannon.cc (modified) (1 diff)

branches/powerups/src/world_entities/weapons/cannon.cc

@@ -32 +32 @@
 #include "list.h"
 #include "animation3d.h"
-#include "sound_engine.h"
 
 #include "null_parent.h"