]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Thu, 22 Feb 2018 03:40:01 +0000 (06:40 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 22 Feb 2018 03:40:01 +0000 (06:40 +0300)
commit019116b8447294682087ba9a23b9268c75a55b3e
tree613ed4ab0b0d70ae8551a0401c88ef00869caf28
parent86a0c4931fd4fc9349c8f91f151c182ce3a5cbdf
parente2ce5fe2840f11885172213e91897e6af52a1903
Merge branch 'Lyberta/Survival' into Lyberta/master
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/server/g_world.qc
xonotic-client.cfg
xonotic-server.cfg