From: Rudolf Polzer Date: Thu, 6 May 2010 18:17:03 +0000 (+0200) Subject: Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~473 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=623a131a558d528a5ddc58ca580980ef8d4067db;hp=-c Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic --- 623a131a558d528a5ddc58ca580980ef8d4067db