]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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
qcsrc/server/weapons/tracing.qc

Simple merge
Simple merge