l10n daemon script 2dcf717c95 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"		2019-09-05 09:08:26 +02:00
..
chm	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
comicbook	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-05 09:08:26 +02:00
djvu	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
dvi	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
epub	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
fax	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
fictionbook	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
kimgio	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
markdown	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
mobipocket	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
ooo	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
plucker	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
poppler	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
spectre	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
tiff	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
txt	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
xps	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
CMakeLists.txt	autotests: Only compile parttest if you have the pdf support	2018-03-21 00:31:05 +01:00