]> 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: 37032a7 5fab88f)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJakob MG <jakob_mg@hotmail.com>
Sat, 31 Dec 2011 11:11:18 +0000 (12:11 +0100)
committerJakob MG <jakob_mg@hotmail.com>
Sat, 31 Dec 2011 11:11:18 +0000 (12:11 +0100)

Trivial merge