resolve conflicts

akkartik

Aug 22, 2025, 7:24 PM

56MHTYR2XEV4DRWLQ7NIB3OXA7RV7NACW7QJ6SQY5XUTER5HWDHAC

Dependencies

• [2] YTPSMU7Y resolve conflicts
• [3] RK2ASPN7 add lots of buttons to the toolbar
• [4] 6RYG2FQJ switch all handlers to run either the app or editor
• [5] Q4CJ4WWU switch to a single global output editor
• [6] UIANMV5F resolve conflicts
• [7] G6WO7RL4 resolve conflicts
• [8] TBTKFVCE resolve conflicts
• [9] 7DX2P2KK resolve conflicts
• [*] ZM7NOBRM new fork: carousel shell

Change contents

• edit in 0012-on.draw at line 31
  [2.182]→[3.3013:3048](∅→∅),[3.333]→[3.3013:3048](∅→∅),[3.3013]→[3.3013:3048](∅→∅),[3.3013]→[3.3013:3048](∅→∅)
  − draw_next_frames_of_animations()