]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into samual/lightning_gun
authorSamual <samual@xonotic.org>
Wed, 9 Mar 2011 15:45:36 +0000 (10:45 -0500)
committerSamual <samual@xonotic.org>
Wed, 9 Mar 2011 15:45:36 +0000 (10:45 -0500)
1  2 
qcsrc/client/hud.qc

Simple merge