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)
commit07504423903fd6c6ec9d47bfd0ff2eb34a042a8c
treec0448087e5b012e449ec99067379432dd711fb06
parent7766418aefbf1e7c90bb5bcfebf40891123c3b85
parentc96303a4cf08c3a73d9f111f81cb915bc06ae510
Merge branch 'master' into terencehill/essential_weapons_panel
defaultXonotic.cfg
qcsrc/client/autocvars.qh