]> 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: e3f177e 6cca430)
Merge branch 'maint' of https://gitlab.com/xonotic/xonotic-data.pk3dir into maint
authorMario <zacjardine@y7mail.com>
Sat, 15 Aug 2015 21:04:18 +0000 (07:04 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 15 Aug 2015 21:04:18 +0000 (07:04 +1000)

Trivial merge