From: Mirio Date: Sat, 11 Apr 2020 11:01:22 +0000 (+0000) Subject: Merge branch 'Spike29/trigger_push_entity_description' into 'master' X-Git-Tag: xonotic-v0.8.5~37 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b0615889472ac61d650c1c7d38073749a7725c0b;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'Spike29/trigger_push_entity_description' into 'master' Rephrase a few trigger_jump keys descriptions ('jump pad' instead of 'teleporter') See merge request xonotic/xonotic-maps.pk3dir!144 --- b0615889472ac61d650c1c7d38073749a7725c0b