Changeset 9406 in orxonox.OLD for trunk/src/world_entities/power_ups/weapon_power_up.cc

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) (1 diff)

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -26 +26 @@
 #include "util/loading/load_param.h"
 
-using namespace std;
+
 
 CREATE_FACTORY(WeaponPowerUp, CL_WEAPON_POWER_UP);