resolve conflicts

akkartik

Jul 10, 2024, 7:50 AM

EQVJOB2CIIIUGPVYR4CBBX36KEZIKIOJ5G5EUIGQFBXJDY6BJ2ZAC

Dependencies

• [2] AZMYKWMH resolve conflicts
• [3] CQVWNL4M resolve conflicts
• [4] HVXZLNCC send errors from event handlers to output editor
• [5] R2ASHK5C fix a bad merge
• [6] QMRQL2FO resolve conflicts
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• edit in edit.lua at line 402
  [3.10420]→[2.246:307](∅→∅)
  − function edit.update_font_settings(State, font_height, font)
• edit in edit.lua at line 404
  [3.10509]→[2.308:372](∅→∅)
  − State.font = font or love.graphics.newFont(State.font_height)