Merge branch 'master' into martin-t/rpc-acc
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 2 Mar 2018 21:03:20 +0000 (22:03 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 2 Mar 2018 21:03:20 +0000 (22:03 +0100)
commit109c961b4eacb3f617d9c66f9fdec40e1264f97e
tree3164c9075fa49519df886b44599d890cf4b9504c
parent26d2cece1d88a2fad9e0a2f8069c3924496698c1
parent10cef691dd4bc92687ff85479c01a70c7704569f
Merge branch 'master' into martin-t/rpc-acc
qcsrc/server/g_damage.qc
qcsrc/server/weapons/tracing.qc