]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into terencehill/essential_weapons_panel
authorSamual <samual@xonotic.org>
Sun, 3 Jul 2011 07:53:38 +0000 (03:53 -0400)
committerSamual <samual@xonotic.org>
Sun, 3 Jul 2011 07:53:38 +0000 (03:53 -0400)
commit5184882771b05f1267c4a267f6298c1516cd2b0a
treed590dd801dddce35cfa28ccc34714e965fd88158
parentfeaaa909b5f810059dae450bdfb45207c13f3a3a
parent294a6d5a6b209ad84ee3bfda9cf2ca84b92c7f9d
Merge remote branch 'origin/master' into terencehill/essential_weapons_panel
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc