l10n daemon script 9d4067059f 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-09-12 04:52:10 +02:00
..
CMakeLists.txt	Fix warning about TRANSLATION_DOMAIN being defined twice	2017-08-30 23:08:48 +02:00
converter.cpp	markdown: Obey the font size set in the settings	2017-08-27 12:04:47 +02:00
converter.h
debug_md.h
generator_md.cpp
generator_md.h
libokularGenerator_md.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-12 04:52:10 +02:00
Messages.sh
okularApplication_md.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-12 04:52:10 +02:00
okularMd.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-25 04:48:47 +02:00
org.kde.mobile.okular_md.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-12 04:52:10 +02:00
org.kde.okular-md.metainfo.xml	GIT_SILENT made messages (after extraction)	2017-09-12 03:23:37 +02:00