]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Tue, 28 Mar 2017 08:53:39 +0000 (11:53 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 28 Mar 2017 08:53:39 +0000 (11:53 +0300)
1  2 
defaultXonotic.cfg
qcsrc/server/client.qc

Simple merge
Simple merge