diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-10-11 14:51:53 +0300 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-10-11 14:51:53 +0300 |
| commit | eb357db5822822c36c395080dac22230efdc54fd (patch) | |
| tree | 32b7409c735c78faa1189071027af59e5dc85ced /src/prefs.h | |
| parent | b60f49bae6756468de7d01c47469efb26f5a9910 (diff) | |
| parent | dece9b7406eb2c6eff768ff8a1badb7ef7076082 (diff) | |
Merge branch 'dev' into work/v1.8
# Conflicts:
# CMakeLists.txt
# res/lang/es.bin
# res/lang/fr.bin
# res/lang/gl.bin
# res/lang/ie.bin
# res/lang/ru.bin
# res/lang/sk.bin
# res/lang/sr.bin
# res/lang/tok.bin
# src/ui/documentwidget.c
Diffstat (limited to 'src/prefs.h')
0 files changed, 0 insertions, 0 deletions