]> 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: d2c8916 2a23ddf)
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJakob MG <jakob_mg@hotmail.com>
Mon, 11 Jun 2012 10:44:42 +0000 (12:44 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Mon, 11 Jun 2012 10:44:42 +0000 (12:44 +0200)

Trivial merge