Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

This commit is contained in:
Rudolf Polzer 2011-10-20 21:49:47 +02:00
commit 79765c958b

View File

@ -844,7 +844,6 @@ bot metaljumper
buttons
time 0
busy 0.1
percussion 35
percussion 66 # 066_Timbale_Low-0.wav
percussion 65