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)
commit2c5f7f2b33fb403cbd719696cd42e6544318d79b
tree1ae0c120a43b0721eea530fb83c0c50aa50b49b5
parent5cbd568da9819ab0e33d36518dc29e6d760883d7
parent4718397c0e1dcd41eadc647f793d67b5e541d080
Merge branch 'master' into samual/water_and_damage_blur
defaultXonotic.cfg
qcsrc/client/View.qc