]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 11:06:56 +0000 (14:06 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 11:06:56 +0000 (14:06 +0300)
commit8919c96e439a5f7f6500925a34d728f3e8348181
tree0e663496ef62f58f7c4c11217d09096751e74f0f
parentac1a67763b9ffdadcef6cddf4e367647f967d6be
parent8ff82c71df24d3ac6e42664a8ad246df579ace0e
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
qcsrc/common/notifications/all.inc
qcsrc/common/t_items.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/events.qh
qcsrc/server/mutators/mutator/gamemode_ca.qc