From: Rudolf Polzer Date: Mon, 28 Jun 2010 12:27:41 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~391 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=0c0cb62b5ccdc329252de87f37b41a9a1eded916 Merge branch 'master' of ssh://git.xonotic.org/xonotic --- 0c0cb62b5ccdc329252de87f37b41a9a1eded916