]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/okc2' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 18 Aug 2017 15:52:22 +0000 (17:52 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 18 Aug 2017 15:52:22 +0000 (17:52 +0200)
commit3eca2c8f2fde1a01dd5323b1f7c74758972e376d
tree7252b4915ee79cd68020ff7143f36f1a2892a0cb
parentf4b1bad998f4a7d1808b0457a6f738af4bf90be9
parent09cf2f947ddfa8cfe424e4bf1b41d67542a2063d
Merge branch 'martin-t/okc2' into martin-t/master
qcsrc/server/weapons/tracing.qc