diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-02-15 17:51:42 +0200 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-02-15 17:51:42 +0200 |
| commit | a97ab6d5b0c2734476432c18a79533c57298cd6e (patch) | |
| tree | dfbb9205222139b2697dc61abdd5785c4cf49d09 /src/fontpack.h | |
| parent | 64eaaaac57fc909a9c9d47302f17f0801b7f2965 (diff) | |
| parent | b5851b5e9d41f3aee289d5d7670f723899edd231 (diff) | |
Merge branch 'dev' into work/v1.11
# Conflicts:
# CMakeLists.txt
# res/lang/cs.bin
# res/lang/de.bin
# res/lang/en.bin
# res/lang/eo.bin
# res/lang/es.bin
# res/lang/es_MX.bin
# res/lang/fi.bin
# res/lang/fr.bin
# res/lang/gl.bin
# res/lang/hu.bin
# res/lang/ia.bin
# res/lang/ie.bin
# res/lang/isv.bin
# res/lang/nl.bin
# res/lang/pl.bin
# res/lang/ru.bin
# res/lang/sk.bin
# res/lang/sr.bin
# res/lang/tok.bin
# res/lang/tr.bin
# res/lang/uk.bin
# res/lang/zh_Hans.bin
# res/lang/zh_Hant.bin
Diffstat (limited to 'src/fontpack.h')
0 files changed, 0 insertions, 0 deletions