Merge branch 'maint' into maint_1.8

This commit is contained in:
Christoph Oelckers 2013-06-24 02:30:45 +02:00
commit 31d748d848

View file

@ -233,6 +233,7 @@ ACTOR GoldWandPuff2 : GoldWandFX1
Skip_Super
+NOBLOCKMAP
+NOGRAVITY
+PUFFONACTORS
States
{
Spawn: