]> 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: 8e9b815 966b4f9)
Merge branch 'master' into fruitiex/runningmanctf
authorFruitieX <rasse@rasse-laptop.(none)>
Sat, 23 Oct 2010 09:19:29 +0000 (12:19 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Sat, 23 Oct 2010 09:19:29 +0000 (12:19 +0300)

Trivial merge