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)
1  2 
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
xonotic-server.cfg

Simple merge
Simple merge
Simple merge