]> 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>
Fri, 2 Feb 2018 12:50:57 +0000 (13:50 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 2 Feb 2018 12:50:57 +0000 (13:50 +0100)
1  2 
qcsrc/server/weapons/tracing.qc

Simple merge