From: Rudolf Polzer Date: Thu, 29 Jul 2010 16:23:56 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~340 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5255097259873540b4f0a6c88b7d16b138534198;p=xonotic%2Fxonotic.git Merge branch 'master' of ssh://git.xonotic.org/xonotic --- 5255097259873540b4f0a6c88b7d16b138534198