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)
commitc93acc75bbbbbd94e50a25efeaba3ad0be2e4d41
treec941263378a1101da656c6fc4b86bd184de510b2
parent52590f03ae7721012362e20299fc2746e98e9b96
parent0396c956370d03a0de773812fd48963fe028018e
Merge branch 'master' into terencehill/physics_panel_updates
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc