]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/okc3' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 7 Oct 2018 21:33:56 +0000 (23:33 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 7 Oct 2018 21:33:56 +0000 (23:33 +0200)
commit01877277cf210d8a43408ce4ce969616669dd099
treefb1f122136bae004e12e080063cc85b2c8bacbd8
parent8bed345c1480754714d0b4b7131cb797b3468503
parent2dea831531d077d9057750ef25a0f9178518f917
Merge branch 'martin-t/okc3' into martin-t/master
qcsrc/server/weapons/tracing.qc