]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into martin-t/vbots
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 18 Sep 2019 03:14:23 +0000 (05:14 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 18 Sep 2019 03:14:23 +0000 (05:14 +0200)
1  2 
commands.cfg
xonotic-server.cfg

diff --cc commands.cfg
Simple merge
Simple merge