diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-10-19 12:47:54 +0300 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-10-19 12:47:54 +0300 |
| commit | 58f483a6aa9a310b297e7474e50c3b7da7568339 (patch) | |
| tree | 4f55bdc7b4c5c4dcc0c998ba61d96e81b27fe68a /res/lang/zh_Hans.bin | |
| parent | e43a0650bd8201f0fca4b5dad3b0618a7bc91351 (diff) | |
| parent | 525c0e24dca01a08ae389b271aee7400ebd8c16b (diff) | |
Merge branch 'dev' into work/v1.8
# Conflicts:
# CMakeLists.txt
# 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/ia.bin
# res/lang/ie.bin
# res/lang/isv.bin
# res/lang/pl.bin
# res/lang/ru.bin
# res/lang/sk.bin
# res/lang/sr.bin
# res/lang/tok.bin
# res/lang/zh_Hans.bin
# res/lang/zh_Hant.bin
# src/app.c
Diffstat (limited to 'res/lang/zh_Hans.bin')
0 files changed, 0 insertions, 0 deletions