]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Thu, 21 Sep 2017 23:05:28 +0000 (02:05 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 21 Sep 2017 23:05:28 +0000 (02:05 +0300)
1  2 
defaultServer.cfg
qcsrc/server/client.qc

Simple merge
Simple merge