Merge branch 'master' into martin-t/cvar-descriptions 717/head
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 28 Sep 2019 16:58:52 +0000 (18:58 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 28 Sep 2019 16:58:52 +0000 (18:58 +0200)
commit97432e0c70ef3105f28b329d089e0eef927b5a60
tree7644981074bd9e183c5e7f510eb6d59ca569860c
parent22d8d3278be0a17a489ec7365133360fffb47e02
parent5d6b967bf27d726370078c61b1b894d2486fb4b3
Merge branch 'master' into martin-t/cvar-descriptions
xonotic-server.cfg