]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a56988 f9063c4)
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJakob MG <jakob_mg@hotmail.com>
Tue, 10 Jul 2012 09:41:04 +0000 (11:41 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 10 Jul 2012 09:41:04 +0000 (11:41 +0200)

Trivial merge