l10n daemon script 867f18a700 SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2024-01-04 02:07:40 +00:00
..
chm	s/qAsConst/std::as_const/	2023-12-19 11:46:24 +00:00
comicbook	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-01-02 02:03:31 +00:00
djvu	Port from deprecated QVariant type	2023-12-21 12:58:31 +00:00
dvi	s/qAsConst/std::as_const/	2023-12-19 11:46:24 +00:00
epub	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-01-02 02:03:31 +00:00
fax	Remove Id from json files. Everything complains and ignores	2023-12-18 22:56:22 +00:00
fictionbook	Port away from deprecated setFontFamily	2023-12-19 12:58:00 +00:00
kimgio	Remove Id from json files. Everything complains and ignores	2023-12-18 22:56:22 +00:00
markdown	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-01-02 02:03:31 +00:00
mobipocket	Remove Id from json files. Everything complains and ignores	2023-12-18 22:56:22 +00:00
plucker	Port away from deprecated setFontFamily	2023-12-19 12:58:00 +00:00
poppler	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-01-04 02:07:40 +00:00
spectre	Remove Id from json files. Everything complains and ignores	2023-12-18 22:56:22 +00:00
tiff	Remove Id from json files. Everything complains and ignores	2023-12-18 22:56:22 +00:00
txt	Remove Id from json files. Everything complains and ignores	2023-12-18 22:56:22 +00:00
xps	s/qAsConst/std::as_const/	2023-12-19 11:46:24 +00:00
CMakeLists.txt	Switch to kf6	2023-12-18 22:56:22 +00:00