]> 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 | combined (merge: aab4ffb 0defff1)
Merge branch 'fruitiex/runningmanctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir...
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 19:32:59 +0000 (22:32 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 19:32:59 +0000 (22:32 +0300)

Trivial merge