]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/electro_combo_over_time
authorMario <mario.mario@y7mail.com>
Wed, 30 Sep 2020 14:57:37 +0000 (00:57 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 30 Sep 2020 14:57:37 +0000 (00:57 +1000)
commit0c5e41855b3527ad980a2900f70d86b80264c0c1
treeba3b66bce95d6d3c7e696c4f6e7d1a128022023b
parentbf4161ef3639ba716090dd4b31c104a8e1617126
parentb91b5fdf11727a5cf30abfea6967fe5f487697f7
Merge branch 'master' into Mario/electro_combo_over_time
qcsrc/server/damage.qc