]> 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: aab7e00 e4cb05a)
Merge branch 'Mirio/credits' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 5 Jan 2015 22:11:04 +0000 (22:11 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 5 Jan 2015 22:11:04 +0000 (22:11 +0000)
Mirio/credits

Updated credits

See merge request !80


Trivial merge