resolve conflicts

akkartik

Dec 9, 2023, 6:07 PM

MJ4G2R3YSLB2GLNK66C742VHWY35V4K3Z2KONY4DSZL6DATGHZEAC

Dependencies

• [2] YY472LBU resolve conflicts
• [3] RSZD5A7G forgot to add json.lua
• [4] 4SR3Z4Y3 document the version of LÖVE I've been using
• [5] PJ5PQAQE record support for multiple versions
• [6] FS2ITYYH record a known issue
• [7] D2TYFYG2 Merge text.love
• [8] T4FRZSYL delete an ancient, unused file
• [9] YF2ATH2Q Merge lines.love
• [10] K2X6G75Z start writing some tests for drawings
• [11] VHQCNMAR several more modules
• [12] D2GCFTTT clean up repl functionality
• [13] KMSL74GA support selections in the source editor
• [14] VP5KC4XZ Merge lines.love
• [15] 34BZ5ZKN Merge lines.love
• [16] AVTNUQYR basic test-enabled framework
• [17] ED4Z6ORC cleaner API for file-system access
• [18] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [19] JOPVPUSA editing source code from within the app
• [20] QD4LOFQR Merge text.love
• [21] FM5LDKGT Merge text.love
• [22] 4YDBYBA4 clean up memory leak experiments
• [23] CE4LZV4T drop last couple of manual tests
• [24] TBTRYEBP Merge lines.love
• [25] CAG7PP5Y Merge text.love
• [26] GFBOJWNE resolve conflicts
• [27] 6LJZN727 handle chords
• [28] 2CTN2IEF Merge lines.love
• [29] BULPIBEG beginnings of a module for the text editor
• [30] 66X36NZN a little more prose describing manual_tests
• [31] CSXIZ4FA resolve conflicts
• [32] R5QXEHUI somebody stop me
• [33] N2NUGNN4 include a brief reference enabling many useful apps
• [34] 73OCE2MC after much struggle, a brute-force undo
• [35] LWPFEZBI Merge lines.love
• [36] BLWAYPKV extract a module
• [37] 3PSFWAIL Merge lines.love
• [38] TVCPXAAU rename
• [39] 36Z442IV back to commit 8123959e52f without code editing
• [40] Q6RXCILQ Merge text.love
• [41] VHUNJHXB Merge lines.love
• [42] VLTU33KW resolve conflicts
• [43] M5JXTW56 Merge text.love
• [44] 3QNOKBFM beginnings of a test harness
• [45] 2L5MEZV3 experiment: new edit namespace
• [46] SGMA5JLE save the list of tests in repo
• [47] RU4HIK43 Merge lines.love
• [48] ZLJYLPOT Merge lines.love
• [49] KKMFQDR4 editing source code from within the app
• [50] XX7G2FFJ intermingle freehand line drawings with text
• [51] 3MJ2PYMW resolve conflicts
• [52] OGUV4HSA remove some memory leaks from rendered fragments
• [53] VXORMHME delete experimental REPL
• [54] LXTTOB33 extract a couple of files
• [55] 2CFLXLIE Merge text.love
• [56] OTIBCAUJ love2d scaffold
• [57] TLOAPLBJ add a license
• [58] VXRYVZ74 Merge text.love
• [59] 6VJTQKW7 start supporting LÖVE v12
• [60] KKQKPGCI resolve conflicts
• [61] ORKN6EOB Merge lines.love

Change contents

• file un-deletion: source_text.lua (----------)source_text.lua (----------)
  [3.147164]→[3.83786:83786](∅→∅),[3.2]→[3.147125:147164](∅→∅),[3.2]→[3.147125:147164](∅→∅)