]> 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: 5111c6d 5a86ab2)
Merge branch 'Mario/entcs_registry' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 17 Mar 2017 13:19:51 +0000 (13:19 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 17 Mar 2017 13:19:51 +0000 (13:19 +0000)
Merge branch Mario/entcs_registry (S merge request)

See merge request !425


Trivial merge