From: Rudolf Polzer Date: Tue, 17 Aug 2010 20:04:31 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~293 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9f16090cb3dca3aeabf41a275d5d49e4edc0b2e3;p=xonotic%2Fxonotic.git Merge branch 'master' of ssh://git.xonotic.org/xonotic --- 9f16090cb3dca3aeabf41a275d5d49e4edc0b2e3