]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 16:50:48 +0000 (19:50 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 16:50:48 +0000 (19:50 +0300)
1  2 
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge