]> 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: b2a0a59 a0219a3)
Merge remote-tracking branch 'origin/Mirio/credits'
authorMario <zacjardine@y7mail.com>
Thu, 11 Dec 2014 23:38:41 +0000 (10:38 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 11 Dec 2014 23:38:41 +0000 (10:38 +1100)

Trivial merge