]> 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: b186e36 b79f477)
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJakob MG <jakob_mg@hotmail.com>
Sun, 17 Jun 2012 11:26:07 +0000 (13:26 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sun, 17 Jun 2012 11:26:07 +0000 (13:26 +0200)

Trivial merge