From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sun, 23 Jun 2013 15:45:05 +0000 (+0200)
Subject: Merge branch 'divVerent/simplified-sound-sliders'
X-Git-Tag: xonotic-v0.8.0~387
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b1288ba426a18f2a8a7743139306b7f6ba3d5cbc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'divVerent/simplified-sound-sliders'
---

b1288ba426a18f2a8a7743139306b7f6ba3d5cbc