robin 61b307ee49 merge resolved

2024-05-08 19:51:41 +02:00

..

BackgroundImage.cpp

merge conflic

2024-05-06 17:08:09 +02:00

BackgroundImage.h

merge conflic

2024-05-06 17:08:09 +02:00

EGlyphLayer.cpp

fix: fixed leak

2024-05-08 19:36:19 +02:00

EGlyphLayer.h

merge conflic

2024-05-06 17:08:09 +02:00

Layer.cpp

merge conflic

2024-05-06 17:08:09 +02:00

Layer.h

merge conflic

2024-05-06 17:08:09 +02:00

LGlyphLayer.cpp

merge resolved

2024-05-08 19:51:41 +02:00

LGlyphLayer.h

merge resolved

2024-05-08 19:51:41 +02:00