]> 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: 26d2cec 10cef69)
Merge branch 'master' into martin-t/rpc-acc
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 2 Mar 2018 21:03:20 +0000 (22:03 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 2 Mar 2018 21:03:20 +0000 (22:03 +0100)
1  2 
qcsrc/server/g_damage.qc patch | diff1 | diff2 | blob | history
qcsrc/server/weapons/tracing.qc patch | diff1 | diff2 | blob | history

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