From: Samual <samual@xonotic.org>
Date: Tue, 18 Jan 2011 19:58:03 +0000 (-0500)
Subject: Merge branch 'master' into samual/water_and_damage_blur
X-Git-Tag: xonotic-v0.5.0~318^2~5^2~3^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2c5f7f2b33fb403cbd719696cd42e6544318d79b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into samual/water_and_damage_blur
---

2c5f7f2b33fb403cbd719696cd42e6544318d79b