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)
commite51ce3d45d2852ca793118fc73da9c25f789101f
tree6d1118dcdb09e3ffafb101d3e7710e8d70a5b086
parentb465997efce43e701dc89d56d82b5ae510505056
parent4181392df811a93dee6b97c303c3f7655f2f0a23
Merge branch 'master' into martin-t/defaults
commands.cfg
xonotic-server.cfg