]> 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>
Sat, 17 Feb 2018 18:05:23 +0000 (19:05 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Feb 2018 18:05:23 +0000 (19:05 +0100)
commit1ef4dce058b47444be3763368a84c37b2117644c
tree86c5594412f430acf610402b8bdb459db928ea1b
parentaaa464fc10bb216a8f47cc2e47b92cd6a8fa66de
parentbda99a9b14d7bcc894ea86c4948dffafd393572a
Merge branch 'martin-t/okc3' into martin-t/master
qcsrc/server/weapons/tracing.qc