Merge branch 'master' into Mario/weaponarena_available
authorMario <mario@smbclan.net>
Mon, 29 Jul 2019 11:02:46 +0000 (21:02 +1000)
committerMario <mario@smbclan.net>
Mon, 29 Jul 2019 11:02:46 +0000 (21:02 +1000)
commit7a450de6b250eccb737d4c428b634496b933e4ff
tree8274bf58fabb2645a886474da29431ed55e7d01d
parent8d9b7f923d981be7330d7f70f1c52ee2de000bf7
parent98eba9cd95e1b0bd3e3411a756b81a12f5997dad
Merge branch 'master' into Mario/weaponarena_available
qcsrc/server/miscfunctions.qc
xonotic-server.cfg