]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 745b8e7 4bdefa2)
Merge remote-tracking branch 'origin/Mirio/credits'
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 01:06:13 +0000 (12:06 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 01:06:13 +0000 (12:06 +1100)

Trivial merge