Merge branch 'master' into martin-t/mg-solidpen
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 30 Jun 2019 15:02:08 +0000 (17:02 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 30 Jun 2019 15:02:08 +0000 (17:02 +0200)
commit865b6850172f0afde171d638656bef17fc49e336
tree5c24f4db343fd3a5fff4b945b0b860b96fa88d99
parent546842f7e5a63b11a9b862dbf1709318bb97689b
parenta20e4983a8a50e81c4e91d146767ae52d3415e3c
Merge branch 'master' into martin-t/mg-solidpen
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
xonotic-server.cfg