]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into fruitiex/mapinfo_improvements
authorFruitieX <fruitiex@gmail.com>
Mon, 15 Nov 2010 10:11:46 +0000 (12:11 +0200)
committerFruitieX <fruitiex@gmail.com>
Mon, 15 Nov 2010 10:11:46 +0000 (12:11 +0200)
commitbae416c5749dbc59d6345fac9e4b7b76d52d15d9
treeb93a5bf6feb96aaca5e7eeb7232b430b1be03e74
parentf598b1a716e97f4f29e6fbf3806ec23fadb8d8ff
parenta0e6c37900598aabfb1da51e1955d1c64feb9f73
Merge branch 'master' into fruitiex/mapinfo_improvements