]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'old-master-that-is-not-fucked' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 10 Aug 2019 18:39:39 +0000 (20:39 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 10 Aug 2019 18:39:39 +0000 (20:39 +0200)
1  2 
qcsrc/server/g_damage.qc

Simple merge