]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 11:40:11 +0000 (14:40 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 11:40:11 +0000 (14:40 +0300)
commit3e5a2740ddd072a99783cf4f9a7ec8d4e8b52e8e
tree3dab0da21715f150f7a11aca3393198e64681073
parentba6a84d0b9f154158ea038085d56f11e4af268ff
parent6c06b8c430b1c76880b4f985ee992763e441c466
Merge branch 'Lyberta/Survival' into Lyberta/master
.gitlab-ci.yml
qcsrc/menu/xonotic/util.qc
qcsrc/server/g_world.qc