]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:09:16 +0000 (19:09 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 8 Jan 2018 16:09:16 +0000 (19:09 +0300)
commite7f099b3a314c830d3d3cb1ff9b4481efe0e7346
tree539178358399bb3bfea984a0a0f1f48059c36fb5
parent1be4f118b306ece2942bd35e6dc9af73aedb2eaa
parent006b15bb5b7072fd09cbf69f1951242d623fe7f6
Merge branch 'Lyberta/Survival' into Lyberta/master
defaultServer.cfg
qcsrc/client/view.qc
qcsrc/server/defs.qh