]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Mon, 28 Aug 2017 20:52:34 +0000 (23:52 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 28 Aug 2017 20:52:34 +0000 (23:52 +0300)
commit25d4b5eb1b81f9cec3230dc48d898646a9dc7871
tree099893868844afb880fadac493670fcbfe4cfb78
parentb9fdb2c786b878b2d9b023fab78127d9a8aff48f
parent9faeb0523c20ae6c86012d38ecb9a73cc49ec83a
Merge branch 'Lyberta/Survival' into Lyberta/master
qcsrc/server/client.qc
qcsrc/server/mutators/mutator/gamemode_survival.qc