]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3676e7 04ae091)
Merge branch 'martin-t/okc3' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 29 Aug 2017 00:46:12 +0000 (02:46 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 29 Aug 2017 00:46:12 +0000 (02:46 +0200)
1  2 
qcsrc/server/weapons/tracing.qc patch | diff1 | diff2 | blob | history

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