Merge branch 'master' into terencehill/essential_weapons_panel
authorterencehill <piuntn@gmail.com>
Thu, 19 May 2011 17:11:38 +0000 (19:11 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 19 May 2011 17:11:38 +0000 (19:11 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/autocvars.qh

Simple merge
Simple merge