]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: d8ea4b0 aaa1908)
Merge branch 'fruitiex/runningmanctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir...
authorFruitieX <rasse@rasse-laptop.(none)>
Sat, 2 Oct 2010 21:05:22 +0000 (00:05 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Sat, 2 Oct 2010 21:05:22 +0000 (00:05 +0300)
Conflicts:
maps/runningmanctf.map


Trivial merge