l10n daemon script 066805c550 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-12-01 04:51:24 +01:00
..
chm	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
comicbook	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
djvu	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
dvi	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
epub	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
fax	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
fictionbook	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
kimgio	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
markdown	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
mobipocket	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
ooo	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
plucker	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
poppler	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
spectre	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
tiff	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
txt	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
xps	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-01 04:51:24 +01:00
CMakeLists.txt	generators: Use a specific description for libzip	2017-11-18 12:22:43 +01:00