Merge branch 'master' into martin-t/cvar-descriptions
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 26 Sep 2019 13:05:44 +0000 (15:05 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 26 Sep 2019 13:05:44 +0000 (15:05 +0200)
commit22d8d3278be0a17a489ec7365133360fffb47e02
treef09e89ad8d9ddb3deb1f990886faff692b0d96f4
parent0cd579d843d8ca47334c6a31389102db9c5f71af
parentad2d918472c84295255fba550959b58cacc9cfb1
Merge branch 'master' into martin-t/cvar-descriptions
commands.cfg
gamemodes-server.cfg
ruleset-XDF.cfg
xonotic-server.cfg