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)
commit014563bb18d2fca287bd53fbde65b057e4ec6eef
treeb12c79081768e29dbdd4b28a75cbe6c982a9f4d0
parent6b386268fae32267c70c4c3c2bf4299e4a04ed16
parente2206feb6fec163ffee9c87d50d8d9580393cd88
Merge branch 'master' into martin-t/vbots
commands.cfg
xonotic-server.cfg