]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:08:44 +0000 (19:08 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:08:44 +0000 (19:08 +0300)
commit006b15bb5b7072fd09cbf69f1951242d623fe7f6
tree64b3f11df7faf62e6e8703fd47ae5065dcd6bd41
parent9b214b224ab7c2e4347af0ad05e431293e82e37b
parent8da02d961e26c65af143ae321d0ea78201983c04
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival