]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sun, 11 Mar 2018 04:34:43 +0000 (07:34 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 11 Mar 2018 04:34:43 +0000 (07:34 +0300)
commit18da05ab673b634dc34a04686431af1d6c171638
tree277d44c6345f6d2ebf228839abedfb985d5260e5
parent1c1f0da0037d2b3f64768cab545631b2fdfd6035
parenteb0f3540d651f0a94f9574fe7504f8ab90c8202b
Merge branch 'Lyberta/Survival' into Lyberta/master
qcsrc/server/client.qc
qcsrc/server/g_world.qc