From: terencehill Date: Thu, 19 May 2011 17:11:38 +0000 (+0200) Subject: Merge branch 'master' into terencehill/essential_weapons_panel X-Git-Tag: xonotic-v0.6.0~40^2~118^2~18^2~13 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=07504423903fd6c6ec9d47bfd0ff2eb34a042a8c Merge branch 'master' into terencehill/essential_weapons_panel --- 07504423903fd6c6ec9d47bfd0ff2eb34a042a8c