Merge branch 'master' into martin-t/globals
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)
commit8e69041898af22d651b6416745431cbaab84b0d5
treed189b9b89402c4705d0609b6e3e63d5d775755a7
parentbb6fa20d3416affe3876a5a42b289a0d28c22bc1
parent3c1e56f26fd675c3606d34b3afa94e3889ff4350
Merge branch 'master' into martin-t/globals
qcsrc/client/view.qc
qcsrc/lib/warpzone/common.qc
qcsrc/server/spawnpoints.qc
qcsrc/server/weapons/tracing.qc