l10n daemon script f1e2ebbaed 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"		2018-01-11 04:50:21 +01:00
..
CMakeLists.txt	Fix warning about TRANSLATION_DOMAIN being defined twice	2017-08-30 23:08:48 +02:00
converter.cpp	Fix string: no exclamation mark, add article	2017-09-21 21:15:37 +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	2018-01-08 04:48:31 +01: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	2018-01-11 04:50:21 +01: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	2018-01-11 04:50:21 +01:00
org.kde.okular-md.metainfo.xml	GIT_SILENT made messages (after extraction)	2018-01-08 03:09:23 +01:00