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

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

c45067564a27d2d3148775446992db29d8e41e32