From: Rudolf Polzer Date: Thu, 17 Jun 2010 07:20:48 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~422^2 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=7e147c7e326b0d218600e590f6289f18bbe93f19 Merge branch 'master' of ssh://git.xonotic.org/xonotic --- 7e147c7e326b0d218600e590f6289f18bbe93f19