]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 7 Oct 2018 21:30:57 +0000 (23:30 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 7 Oct 2018 21:30:57 +0000 (23:30 +0200)
commit2dea831531d077d9057750ef25a0f9178518f917
tree5e000d63a318cfc077a95e1e9c7475de2b58d4f3
parenta1b5193fe8388812267a165c966d7eeeea47d72a
parent14dac52c4502ffd7c2d6e86948c04f00acc979b4
Merge branch 'master' into martin-t/okc3
qcsrc/server/g_damage.qc