From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 1 Dec 2010 16:47:10 +0000 (+0100)
Subject: Merge remote branch 'origin/samual/newsounds'
X-Git-Tag: xonotic-v0.1.0preview~84
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e78d58310d82e6cbd9543b1d06c1fd6ee8f195cd;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/samual/newsounds'
---

e78d58310d82e6cbd9543b1d06c1fd6ee8f195cd