From: Lyberta <lyberta@lyberta.net>
Date: Wed, 4 Apr 2018 16:42:10 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/KillSound
X-Git-Tag: xonotic-v0.8.5~2173^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c3f4bfe02b1f024b183210717a4da3f84ddc0079;hp=71636e8f68cd31db1aabb442259a11c3bb3b3866

Merge branch 'master' into Lyberta/KillSound
---

diff --git a/sound/misc/kill.ogg b/sound/misc/kill.ogg
index c1d3b8c237..158e827e68 100644
Binary files a/sound/misc/kill.ogg and b/sound/misc/kill.ogg differ
diff --git a/sound/misc/kill.wav b/sound/misc/kill.wav
new file mode 100644
index 0000000000..139ff57178
Binary files /dev/null and b/sound/misc/kill.wav differ