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

Simple merge