l10n daemon script 7be388fa0f 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"		2015-08-31 04:47:52 +00:00
..
chm	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
comicbook	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
djvu	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
dvi	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
epub	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
fax	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
fictionbook	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
kimgio	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
mobipocket	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
ooo	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
plucker	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
poppler	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
spectre	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
tiff	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
txt	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
xps	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-31 04:47:52 +00:00
CMakeLists.txt	Compile++	2013-11-04 21:38:52 +01:00