]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8bed345 2dea831)
Merge branch 'martin-t/okc3' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 7 Oct 2018 21:33:56 +0000 (23:33 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 7 Oct 2018 21:33:56 +0000 (23:33 +0200)
1  2 
qcsrc/server/weapons/tracing.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/weapons/tracing.qc
Simple merge