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)
1  2 
defaultXonotic.cfg

Simple merge