okular/generators
l10n daemon script cc5849a6f8 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"
2021-09-08 02:33:19 +00:00
..
chm SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-08 02:33:19 +00:00
comicbook GIT_SILENT Update Appstream for new release 2021-08-27 22:59:54 +02:00
djvu GIT_SILENT Update Appstream for new release 2021-08-27 22:59:54 +02:00
dvi SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-08 02:33:19 +00:00
epub SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-06 02:31:07 +00:00
fax SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-06 02:31:07 +00:00
fictionbook GIT_SILENT Update Appstream for new release 2021-08-27 22:59:54 +02:00
kimgio GIT_SILENT Update Appstream for new release 2021-08-27 22:59:54 +02:00
markdown GIT_SILENT Update Appstream for new release 2021-08-27 22:59:54 +02:00
mobipocket SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-06 02:31:07 +00:00
plucker SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-06 02:31:07 +00:00
poppler SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-08 02:33:19 +00:00
spectre SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-06 02:31:07 +00:00
tiff SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-08 02:33:19 +00:00
txt SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-08 02:33:19 +00:00
xps SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-06 02:31:07 +00:00
CMakeLists.txt Use more standard cmake functionality to search for discount 2021-01-24 11:16:49 +00:00