]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitde80fdc77c3b99cec594c92993c6d142ad9a94ae
tree4f60307e34d0a44ada531d7fa08d80408c25c847
parentf93bde9df83efabaa317f00474da6b2ac5642fab
parent84f0ef2e09d581da11433fa029cc9b44f4b58092
Merge branch 'martin-t/okc3' into martin-t/master
qcsrc/server/weapons/tracing.qc