]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/okc3' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 14 Aug 2018 16:03:18 +0000 (18:03 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 14 Aug 2018 16:03:18 +0000 (18:03 +0200)
commit8bed345c1480754714d0b4b7131cb797b3468503
tree8697ac6fd708973f544f7a39371a6a876de602d9
parent636c259fb79c43bb60510f2cb4ea0b0c0708d4c5
parenta1b5193fe8388812267a165c966d7eeeea47d72a
Merge branch 'martin-t/okc3' into martin-t/master
qcsrc/server/weapons/tracing.qc