l10n daemon script 91e740c236 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-04-17 04:01:59 +02:00
..
chm	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
comicbook	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
djvu	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
dvi	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
epub	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
fax	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
fictionbook	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
kimgio	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
mobipocket	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
ooo	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
plucker	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
poppler	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
spectre	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
tiff	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
txt	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
xps	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-17 04:01:59 +02:00
CMakeLists.txt	cmake: Remove endif that doesn't match opening if	2017-04-06 22:14:01 +02:00