]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:54:15 +0000 (19:54 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:54:15 +0000 (19:54 +0300)
commit25e676aaec3773c33896315128323850500c765c
tree9560733dbece8769a7f41416e659e8029fe65281
parent1235b825df69ba23754c37594cfb3308c977cf2b
parent6e3f46e7666b5d62c78472f466585f43452b6442
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
.gitlab-ci.yml
qcsrc/common/t_items.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/events.qh
qcsrc/server/mutators/mutator/gamemode_assault.qc
qcsrc/server/mutators/mutator/gamemode_invasion.qc