From: Rudolf Polzer Date: Sat, 5 Mar 2011 21:32:55 +0000 (+0100) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0~122^2~2 X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=3c9f2bd0cecdf01dc946eece08a2007f5b929a9b;p=xonotic%2Fxonotic.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic --- 3c9f2bd0cecdf01dc946eece08a2007f5b929a9b