Merge branch 'samual/water_and_damage_blur' into samual/hud_contents
authorSamual <samual@xonotic.org>
Tue, 18 Jan 2011 21:11:58 +0000 (16:11 -0500)
committerSamual <samual@xonotic.org>
Tue, 18 Jan 2011 21:11:58 +0000 (16:11 -0500)
commitc45067564a27d2d3148775446992db29d8e41e32
treed328f7e8c59f308d322015163a2f6563b1729e6c
parentb8dfee2e3a9690a72d4484e8adf4e0d25901abe4
parent2c5f7f2b33fb403cbd719696cd42e6544318d79b
Merge branch 'samual/water_and_damage_blur' into samual/hud_contents
defaultXonotic.cfg