]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into terencehill/essential_weapons_panel
authorSamual <samual@xonotic.org>
Mon, 29 Aug 2011 07:16:36 +0000 (03:16 -0400)
committerSamual <samual@xonotic.org>
Mon, 29 Aug 2011 07:16:36 +0000 (03:16 -0400)
1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc

Simple merge
Simple merge