]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/server/g_damage.qc

Simple merge