]> 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>
Tue, 29 Aug 2017 00:46:12 +0000 (02:46 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 29 Aug 2017 00:46:12 +0000 (02:46 +0200)
commitb925de6d5336903af1357ce1ab3b62a573ff99b7
tree3a540772ef7cded6abb06c2d342c662a22fa3048
parente3676e764213559ec7d245b021be0b3b1a29b0a3
parent04ae091566c0a6d1f50702eee7563fb8efb26504
Merge branch 'martin-t/okc3' into martin-t/master
qcsrc/server/weapons/tracing.qc