diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-01-05 13:52:53 +0200 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-01-05 13:52:53 +0200 |
| commit | db50d121c7503ae38ebae5de21ef6705518b4122 (patch) | |
| tree | 83ed50257c45708c300ba90252778031b532ce54 /res/lang/en.bin | |
| parent | 680db07eabd116cfde9d2894c69ff14e6d5e01ad (diff) | |
| parent | 2bd476483a37662797b70d6577ddb0da64cdbaa6 (diff) | |
Merge branch 'work/v1.10' into dev
# Conflicts:
# CMakeLists.txt
# Depends-Android.cmake
# res/about/version.gmi
# res/lang/cs.bin
# res/lang/eo.bin
# res/lang/es.bin
# res/lang/fi.bin
# res/lang/gl.bin
# res/lang/ia.bin
# res/lang/ie.bin
# res/lang/ru.bin
# res/lang/sr.bin
# res/lang/tok.bin
# res/lang/tr.bin
# res/lang/uk.bin
# res/lang/zh_Hant.bin
# src/app.c
# src/main.c
# src/ui/documentwidget.c
# src/ui/labelwidget.c
# src/ui/sidebarwidget.c
# src/ui/util.c
Diffstat (limited to 'res/lang/en.bin')
0 files changed, 0 insertions, 0 deletions