okular/generators
l10n daemon script 42650e4f27 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"
2017-11-28 05:07:33 +01:00
..
chm GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
comicbook GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
djvu GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
dvi GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
epub GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
fax GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
fictionbook GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
kimgio Merge branch 'dont-use-docdata-for-annots-and-forms' into Applications/17.12 2017-11-16 15:00:23 +01:00
markdown SVN_SILENT made messages (.desktop file) - always resolve ours 2017-11-28 05:07:33 +01:00
mobipocket Add a few overrides 2017-11-03 15:20:01 +01:00
ooo GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
plucker GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
poppler Merge branch 'dont-use-docdata-for-annots-and-forms' into Applications/17.12 2017-11-16 15:00:23 +01:00
spectre Fix CMake Error in generators/spectre/CMakeLists.txt 2017-11-04 00:25:39 +01:00
tiff GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
txt GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
xps GIT_SILENT made messages (after extraction) 2017-10-20 03:05:06 +02:00
CMakeLists.txt generators: Use a specific description for libzip 2017-11-18 12:22:43 +01:00