okular/generators
l10n daemon script ee0c3c0f17 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-05-11 06:20:55 +02:00
..
chm tweak spacing to make clang-10 happier 2020-04-19 17:29:35 +02:00
comicbook SVN_SILENT made messages (.desktop file) - always resolve ours 2020-05-11 06:20:55 +02:00
djvu Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
dvi Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
epub Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
fax Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
fictionbook Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
kimgio Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
markdown Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
mobipocket Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
ooo Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
plucker Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
poppler Make clazy happy 2020-04-18 23:48:51 +02:00
spectre Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
tiff Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
txt Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
xps Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
CMakeLists.txt Use ${KF5_REQUIRED_VERSION} also for ECM 2020-04-08 21:56:29 +02:00