Changeset 6222 in orxonox.OLD for trunk/src/world_entities/power_ups/laser_power_up.cc

Timestamp:

Dec 21, 2005, 1:49:06 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/world_entities/power_ups/laser_power_up.cc (modified) (1 diff)

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -19 +19 @@
 #include "factory.h"
 #include "state.h"
-#include "list.h"
 
 #include "primitive_model.h"