From: Rudolf Polzer Date: Mon, 26 Apr 2010 12:11:23 +0000 (+0200) Subject: Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~482 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=169208535f74c8cd2c2ca4d855cce6fd304af7b1;p=xonotic%2Fxonotic.git Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic --- 169208535f74c8cd2c2ca4d855cce6fd304af7b1