Changeset 5935 for code/branches/pickup/src/orxonox/weaponsystem/Munition.h

Timestamp:

Oct 13, 2009, 5:05:17 PM (16 years ago)

Author:

dafrick

Message:

Hopefully merged trunk successfully into pickup branch.

Location:

code/branches/pickup

Files:

• . (modified) (1 prop)
• src/orxonox/weaponsystem/Munition.h (modified) (1 diff)

code/branches/pickup/src/orxonox/weaponsystem/Munition.h

@@ -47 +47 @@
 
                 unsigned int munition_;
-                Timer<Magazine> loadTimer_;
+                Timer loadTimer_;
                 bool bLoaded_;