Merge branch 'master' into terencehill/maximized_radar
authorterencehill <piuntn@gmail.com>
Mon, 3 Oct 2011 19:38:06 +0000 (21:38 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 3 Oct 2011 19:38:06 +0000 (21:38 +0200)
commit88296a0f82b51a5b98d15f7be8032cdf584eec99
tree392e7fb9645917c94b4cd16180c2167c1ed63273
parent38f3cd81498291250da8d55559f4a11f3ac8e022
parent4c9bdccc1b775ac87601c56f9eb286d3bee06f5a
Merge branch 'master' into terencehill/maximized_radar
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc