Merge branch 'master' into martin-t/defaults
authorMario <mario@smbclan.net>
Mon, 11 Jun 2018 08:06:38 +0000 (18:06 +1000)
committerMario <mario@smbclan.net>
Mon, 11 Jun 2018 08:06:38 +0000 (18:06 +1000)
1  2 
commands.cfg
xonotic-server.cfg

diff --cc commands.cfg
Simple merge
Simple merge