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

diff --cc bal-wep-xpm.cfg
Simple merge
Simple merge
Simple merge
Simple merge