tmp push merge resolution not finished

This commit is contained in:
Baptiste GOULARD 2024-11-28 16:02:06 +01:00
parent 2568aa69a6
commit 00dc0e9e67
16 changed files with 454 additions and 59 deletions

View file

@ -1,7 +1,7 @@
SO ./textures/png_ugly.png
NO ./textures/png_ugly.png
WE ./textures/png_pretty.png
EA ./textures/png_pretty.png
SO ./textures/a.xpm
NO ./textures/a.xpm
WE ./textures/a.xpm
EA ./textures/a.xpm
F 255,255,255
C 255,255,255
@ -18,6 +18,11 @@ C 255,255,255
111
1N1
111
11111111111111111111111
100000000N0000000000001
10000000000000000000001
10000000000000000000001
11111011101100111110011
11000000000000000000001
11110111111111111111111
11111111