Merge branch 'master' into martin-t/globals 623/head
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Aug 2019 18:30:52 +0000 (20:30 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Aug 2019 18:30:52 +0000 (20:30 +0200)
1  2 
qcsrc/client/view.qc
qcsrc/lib/warpzone/common.qc
qcsrc/server/spawnpoints.qc
qcsrc/server/weapons/tracing.qc

Simple merge
Simple merge
Simple merge
Simple merge