]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 16 Nov 2018 17:58:50 +0000 (18:58 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 16 Nov 2018 17:58:50 +0000 (18:58 +0100)
commit846127001326ab0cb98b2480a2c293f3981039c6
tree8d7d28fa8e2a76b404ca9de4b523621faf71f937
parent2dea831531d077d9057750ef25a0f9178518f917
parent314e90960336ef340dc7eb34ae375a091ac60645
Merge branch 'master' into martin-t/okc3
qcsrc/server/g_damage.qc