]> 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: 0e80520 d5219cc)
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorMaidenBeast <fel.sallustio@gmail.com>
Fri, 29 Jul 2011 09:25:56 +0000 (11:25 +0200)
committerMaidenBeast <fel.sallustio@gmail.com>
Fri, 29 Jul 2011 09:25:56 +0000 (11:25 +0200)

Trivial merge