Merge branch 'master' into martin-t/mg-solidpen
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 3 Sep 2019 10:23:22 +0000 (12:23 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 3 Sep 2019 10:23:22 +0000 (12:23 +0200)
commit126564db487c07249d4205e829d3cfe6df16635b
tree0a8b7fe20e0a01591910823e69b1d6eee007ca7a
parent8f097169d5911eb262a2942ac5eeeddca9ac8e4a
parentb4e34b1127c172aa0617988ea8ed22a1c0ce9feb
Merge branch 'master' into martin-t/mg-solidpen
bal-wep-xpm.cfg
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
xonotic-server.cfg