]> 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: b631950 8e69041)
Merge branch 'martin-t/globals' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Aug 2019 18:32:58 +0000 (20:32 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Aug 2019 18:32:58 +0000 (20:32 +0200)
1  2 
qcsrc/server/weapons/tracing.qc patch | diff1 | diff2 | blob | history

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