]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 336fcf1 6b7ea2d)
Merge branch 'bones_was_here/fc_auto_helpme' into 'master'
authorterencehill <piuntn@gmail.com>
Mon, 28 Jun 2021 08:53:52 +0000 (08:53 +0000)
committerterencehill <piuntn@gmail.com>
Mon, 28 Jun 2021 08:53:52 +0000 (08:53 +0000)
commitae838b73ec88a21b5a7b27937b0b1405b56e217d
tree2e8d2c646596a50aed9624f751747b035adc474ctree | snapshot
parent336fcf1fbdebda9ffc92a8222358bc95cbf9661bcommit | diff
parent6b7ea2d70b78a391981ce48917e4fee7e2be9034commit | diff
Merge branch 'bones_was_here/fc_auto_helpme' into 'master'

Whitelist g_ctf_flagcarrier_auto_helpme_damage

See merge request xonotic/xonotic-data.pk3dir!909
qcsrc/server/world.qc diff1 | diff2 | blob | history