From: Rudolf Polzer Date: Sun, 10 Oct 2010 14:53:39 +0000 (+0200) Subject: Merge remote branch 'origin/divVerent/convert-from-map-to-map' X-Git-Tag: xonotic-v0.5.0~173 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=61c537beac8ac40367b16a2eec937712b04ad63e;p=xonotic%2Fnetradiant.git Merge remote branch 'origin/divVerent/convert-from-map-to-map' --- 61c537beac8ac40367b16a2eec937712b04ad63e