Merge branch 'master' into martin-t/mg-solidpen
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 29 Aug 2019 23:48:17 +0000 (01:48 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 29 Aug 2019 23:48:17 +0000 (01:48 +0200)
1  2 
bal-wep-xonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/defs.qh
qcsrc/server/weapons/tracing.qc
vehicles.cfg
xonotic-server.cfg

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc vehicles.cfg
Simple merge
Simple merge