Merged heads.

2009-05-02 07:11:05 +02:00
parent 2ec263f2a0 3cc2087dce
commit 460b6ddf6d
44 changed files with 52 additions and 54 deletions
--- a/src/zr/weapons/restrict.inc
+++ b/src/zr/weapons/restrict.inc
@ -894,4 +894,4 @@ public RestrictCanUse(client, weapon, dummy1, dummy2, dummy3, dummy4)
    
    // Allow pickup.
    return Hacks_Continue;
-}
+}