From: Rudolf Polzer Date: Fri, 20 Aug 2010 12:23:07 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~286^2 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=c3b65641f6ba82a8e001ab57b5d9117f907e7669 Merge branch 'master' of ssh://git.xonotic.org/xonotic --- c3b65641f6ba82a8e001ab57b5d9117f907e7669