From: terencehill Date: Thu, 10 May 2012 16:11:09 +0000 (+0200) Subject: Merge branch 'master' into terencehill/mutators_dialog_cleanup X-Git-Tag: xonotic-v0.7.0~267^2 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=cc8895c290e5b20ea8f3d47dd6110f2f0fc7b3ac;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/mutators_dialog_cleanup --- cc8895c290e5b20ea8f3d47dd6110f2f0fc7b3ac