From: FruitieX Date: Mon, 15 Nov 2010 10:11:46 +0000 (+0200) Subject: Merge branch 'master' into fruitiex/mapinfo_improvements X-Git-Tag: xonotic-v0.1.0preview~33^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bae416c5749dbc59d6345fac9e4b7b76d52d15d9;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into fruitiex/mapinfo_improvements --- bae416c5749dbc59d6345fac9e4b7b76d52d15d9