Merge branch 'master' into terencehill/physics_panel_updates
authorterencehill <piuntn@gmail.com>
Tue, 29 Nov 2011 18:03:20 +0000 (19:03 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 29 Nov 2011 18:03:20 +0000 (19:03 +0100)
1  2 
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc

Simple merge
Simple merge
Simple merge
Simple merge