okular/generators
l10n daemon script f353ed2a9b 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"
2020-04-20 09:50:10 +02:00
..
chm GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
comicbook SVN_SILENT made messages (.desktop file) - always resolve ours 2020-04-20 09:50:10 +02:00
djvu GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
dvi GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
epub GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
fax GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
fictionbook GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
kimgio GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
markdown GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
mobipocket GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
ooo GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
plucker GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
poppler GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
spectre GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
tiff GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
txt GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
xps GIT_SILENT fix version 2020-04-16 00:06:00 +02:00
CMakeLists.txt Update links to the dependencies 2019-11-21 17:54:42 +02:00