Merge branch 'master' into Mario/weaponarena_available
authorMario <mario@smbclan.net>
Sun, 11 Aug 2019 11:32:33 +0000 (21:32 +1000)
committerMario <mario@smbclan.net>
Sun, 11 Aug 2019 11:32:33 +0000 (21:32 +1000)
commita568545ed787883224aa1cff980bd5b50a661edc
treea61bc33682f7ac17649d5fc3e3673a42dcd2b1f6
parent7a450de6b250eccb737d4c428b634496b933e4ff
parentdf33af4f3b2347ecf28f744da7a2814c004b57cb
Merge branch 'master' into Mario/weaponarena_available
qcsrc/server/miscfunctions.qc
xonotic-server.cfg