From: Rudolf Polzer Date: Tue, 7 Sep 2010 13:36:39 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~235 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=e4dbbe2f30f2573ccfcc14050bb1f41c0324e30c;hp=-c Merge branch 'master' of ssh://git.xonotic.org/xonotic --- e4dbbe2f30f2573ccfcc14050bb1f41c0324e30c