]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Wed, 24 May 2017 04:33:20 +0000 (07:33 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 24 May 2017 04:33:20 +0000 (07:33 +0300)
commit88143d3b9d7e5772646df20b9e82b3e461970fe0
tree8d6dc8f85b53ac6fcbeef05a300a53cfbcb0cfc9
parent6906905aff3262d7842d5086452349bfd4fb33e2
parent05e3807aba750351f5606bca088bf630bc80dcdb
Merge branch 'master' into Lyberta/Survival
qcsrc/server/client.qc
qcsrc/server/g_world.qc
qcsrc/server/player.qc