From: Rudolf Polzer Date: Sat, 16 Apr 2011 17:05:45 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0~105 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fe07dcce0eccf7d79777794df97f71a994365dbc;p=xonotic%2Fxonotic.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic --- fe07dcce0eccf7d79777794df97f71a994365dbc