Merge branch 'master' into martin-t/defaults
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Feb 2018 18:47:06 +0000 (19:47 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Feb 2018 18:47:06 +0000 (19:47 +0100)
commitb465997efce43e701dc89d56d82b5ae510505056
tree9031865aa5836d2cb1cfacdcff65e2b4362b4d61
parent9fb6f9fefde151aaf125cb4ffce31e714148da68
parentcbd5749bf3064a7b8cde93d3e366719fc9ca1f6a
Merge branch 'master' into martin-t/defaults
xonotic-server.cfg