Merge branch 'master' into martin-t/globals
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 28 Jul 2019 00:59:01 +0000 (02:59 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 28 Jul 2019 00:59:01 +0000 (02:59 +0200)
commit3331142a41bd023ef15ced5210a2e1a2206bbb3c
treea94508b9cc5d98cbd4dedfda3afb505cf4942773
parent45d91b925162d4c73853e68f1100b81ac8d782d8
parentb3b4bdb9f8740bb1d571287064394179c2305456
Merge branch 'master' into martin-t/globals
qcsrc/client/view.qc
qcsrc/server/weapons/tracing.qc