Merge branch 'master' into terencehill/essential_weapons_panel
authorterencehill <piuntn@gmail.com>
Tue, 24 May 2011 22:34:29 +0000 (00:34 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 24 May 2011 22:34:29 +0000 (00:34 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/hud.qc

Simple merge
Simple merge