]> 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>
Fri, 16 Nov 2018 17:59:22 +0000 (18:59 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 16 Nov 2018 17:59:22 +0000 (18:59 +0100)
commita36c373a767ddffaf926b2f2e428b65368a13fe6
tree9af048cac3322db95c63414cb352e8f2968fbddc
parent01877277cf210d8a43408ce4ce969616669dd099
parent846127001326ab0cb98b2480a2c293f3981039c6
Merge branch 'martin-t/okc3' into martin-t/master
qcsrc/server/weapons/tracing.qc