l10n daemon script dbb801f25a 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-01 04:36:38 +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	Small rework for the markdown converter	2017-08-25 01:14:58 +02:00
debug_md.h	add markdown support	2017-08-25 01:05:23 +02:00
generator_md.cpp	add markdown support	2017-08-25 01:05:23 +02:00
generator_md.h	add markdown support	2017-08-25 01:05:23 +02:00
libokularGenerator_md.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-01 04:36:38 +02:00
Messages.sh	add markdown support	2017-08-25 01:05:23 +02:00
okularApplication_md.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-01 04:36:38 +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-01 04:36:38 +02:00
org.kde.okular-md.metainfo.xml	GIT_SILENT made messages (after extraction)	2017-09-01 03:04:47 +02:00