]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:10:39 +0000 (16:10 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:10:39 +0000 (16:10 +0300)
1  2 
defaultXonotic.cfg
qcsrc/server/client.qc

Simple merge
Simple merge