From: Rudolf Polzer Date: Fri, 30 Jul 2010 13:47:54 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/netradiant X-Git-Tag: xonotic-v0.5.0~245 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4741e6535e6bbdf58ab856a3edd7f2b37761592b;p=xonotic%2Fnetradiant.git Merge branch 'master' of ssh://git.xonotic.org/netradiant --- 4741e6535e6bbdf58ab856a3edd7f2b37761592b