]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit48ef3f936d6af04dbb3cd1c018e8d937f99ec171
tree97c206cb6f1e577255d34652128a13103caf454b
parent846127001326ab0cb98b2480a2c293f3981039c6
parentb1ecf9914d3a589b7ee5f3dd5fda4045ccfcfdda
Merge branch 'old-master-that-is-not-fucked' into martin-t/okc3
qcsrc/server/g_damage.qc