]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/client/view.qc
qcsrc/server/weapons/tracing.qc

Simple merge
Simple merge