Merge lines.love

Dependencies

• [2] AU424KN7 Merge lines.love
• [3] G3PZV45B Merge lines.love
• [4] VN3MTXFK Merge lines.love
• [5] OMLASW7K experiment at avoiding some merge conflicts
• [6] YMNOUE2M ugh, missed deleting an arg
• [7] EJOZAD7N typo
• [8] KFCDC75U Merge lines.love
• [9] 57OGXVHZ Merge lines.love
• [10] 5RDWSYK2 consistently use App names for methods everywhere
• [11] KKMFQDR4 editing source code from within the app
• [12] 7VGDIPLC more robust state validation
• [13] 2CK5QI7W make love event names consistent
• [14] X3CQLBTR set window title within each app

Change contents

• edit in source.lua at line 75
  [6.167316]→[2.11:59](∅→∅)
  − love.window.setTitle('capture.love - source')
• resurrect zombie in source.lua at line 75
  [6.167316]→[5.12:104](∅→∅),[6.167316]→[5.12:104](∅→∅),[6.57]→[5.105:108](∅→∅),[6.57]→[5.105:108](∅→∅)
  +

  +

  +

  + -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708

  +

  +

  +
• edit in source.lua at line 79
  [5.104]

  [5.105]
  + love.window.setTitle('capture.love - source')
• edit in source.lua at line 228
  [6.172371]→[2.60:108](∅→∅)
  − love.window.setTitle('capture.love - source')
• resurrect zombie in source.lua at line 228
  [6.172371]→[5.109:201](∅→∅),[6.172371]→[5.109:201](∅→∅),[6.104]→[5.202:205](∅→∅),[6.104]→[5.202:205](∅→∅)
  +

  +

  +

  + -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708

  +

  +

  +
• edit in source.lua at line 232
  [5.201]

  [5.202]
  + love.window.setTitle('capture.love - source')
• edit in run.lua at line 40
  [6.303]

  [4.17]
  +

  +
• edit in run.lua at line 43
  [6.179197]

  [6.304]
  + -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
• resurrect zombie in run.lua at line 45
  [6.179197]→[5.303:305](∅→∅),[6.179197]→[5.303:305](∅→∅)
  +

  +
• resolve order conflict in run.lua at line 45
  [6.369]

  [5.303]
• edit in run.lua at line 109
  [6.181819]→[6.181819:181820](∅→∅),[6.81]→[5.306:398](∅→∅),[6.81]→[5.306:398](∅→∅),[6.81]→[5.306:398](∅→∅),[6.182292]→[5.399:400](∅→∅),[6.182292]→[5.399:400](∅→∅)
  −

  −

  −

  −

  − -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708

  −
• resurrect zombie in run.lua at line 109
  [5.400]→[5.400:401](∅→∅),[5.400]→[5.400:401](∅→∅)
  +
• edit in run.lua at line 110
  [5.401]→[5.401:402](∅→∅),[5.401]→[5.401:402](∅→∅)
  −
• edit in run.lua at line 174
  [6.184045]→[3.17:17](∅→∅),[6.48]→[5.210:302](∅→∅),[6.48]→[5.210:302](∅→∅),[6.48]→[5.210:302](∅→∅)
  −

  −

  −

  −

  − -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708
• resolve order conflict in run.lua at line 174
  [6.184045]