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)
commit2547369acbe9fc29dd9101a6d93f3a2056ef7368
tree08d3031f4cbbfe796d3718de84636f64a0bc994a
parentac95cb7d7114378f2c9ffd07edd7ae99a0961a2e
parent297e90c2fbe1a3abdd3c888582d4458e7bc36518
Merge remote branch 'origin/master' into terencehill/essential_weapons_panel
defaultXonotic.cfg
qcsrc/client/hud.qc