]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07a9289 88bc9dc)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorJakob MG <jakob_mg@hotmail.com>
Thu, 13 Oct 2011 23:33:41 +0000 (01:33 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 13 Oct 2011 23:33:41 +0000 (01:33 +0200)

Trivial merge