]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'martin-t/okc3' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 14 Aug 2018 16:03:18 +0000 (18:03 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 14 Aug 2018 16:03:18 +0000 (18:03 +0200)
1  2 
qcsrc/server/weapons/tracing.qc

Simple merge