]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Thu, 17 May 2018 09:30:33 +0000 (12:30 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 17 May 2018 09:30:33 +0000 (12:30 +0300)
commit2a60f98eb86a443ae60294ea891d97f376e81bd0
tree2860c07eddb875757450bfbb19decde8ce71f9f8
parenta57d18f81f6d3fa70b913980480a9bb94c1d3b3f
parent9cd410725f932e8bc62a7b9a4422aa2fc9915d3f
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
qcsrc/server/client.qc
qcsrc/server/command/cmd.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/events.qh
qcsrc/server/player.qh