From: Rudolf Polzer Date: Fri, 26 Mar 2010 07:59:18 +0000 (+0100) Subject: Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~534 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=c2ed283428ee4e6c12272b23d5a5e26c35e0d13c Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic --- c2ed283428ee4e6c12272b23d5a5e26c35e0d13c