Merge branch 'master' into martin-t/mg-solidpen
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 13 Feb 2019 23:38:24 +0000 (00:38 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 13 Feb 2019 23:38:24 +0000 (00:38 +0100)
commit546842f7e5a63b11a9b862dbf1709318bb97689b
tree1282c3ae4a545851eb483a1a26daf1aee82a2922
parent8dc66863c53931f676b3ba6973f010e87b19e643
parente114a20b1ab543b0f4b1791b188eae768f2ca8c4
Merge branch 'master' into martin-t/mg-solidpen
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/weapons/tracing.qc
vehicles.cfg
xonotic-server.cfg