]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitd90297fe2e485703b2d5ed64540727fd52ea1b4e
treedd848de08b6acf0cc7dd6a1a5f6c7fbbe9d6d25e
parent5111c6daa0b6d0d6ae16fd84de1a7940d856704d
parent5a86ab285513cf780f11d94723e6e1611c343179
Merge branch 'Mario/entcs_registry' into 'master'

Merge branch Mario/entcs_registry (S merge request)

See merge request !425