From: Rudolf Polzer Date: Thu, 21 Oct 2010 15:30:55 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.1.0preview~125 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=46fb2154dc0d032f0704d56d9c7f9dbbadff38aa;p=xonotic%2Fxonotic.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic --- 46fb2154dc0d032f0704d56d9c7f9dbbadff38aa