Merge branch 'master' into samual/water_and_damage_blur
authorSamual <samual@xonotic.org>
Tue, 18 Jan 2011 19:58:03 +0000 (14:58 -0500)
committerSamual <samual@xonotic.org>
Tue, 18 Jan 2011 19:58:03 +0000 (14:58 -0500)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc

Simple merge
Simple merge