Merge remote branch 'origin/master' into terencehill/essential_weapons_panel
authorSamual <samual@xonotic.org>
Mon, 12 Sep 2011 06:37:32 +0000 (02:37 -0400)
committerSamual <samual@xonotic.org>
Mon, 12 Sep 2011 06:37:32 +0000 (02:37 -0400)
commitdb3d8b68f0aff3f1304428e9d60836b4a8013a5a
treeee5a0135a76c3a1ff667b374ea0a911477242eb1
parent2547369acbe9fc29dd9101a6d93f3a2056ef7368
parentbb4571959d522baddbf445b968aba15bb4ad6f34
Merge remote branch 'origin/master' into terencehill/essential_weapons_panel
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc