l10n daemon script 767a1c0eac 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-05-21 04:36:10 +02:00
..
CMakeLists.txt	add metadata for kimgio, mobipocket, ooo, plucker, poppler, spectre, txt, xps	2016-11-09 11:30:19 +01:00
converter.cpp	Use QStringLiteral	2015-10-29 13:37:11 +01:00
converter.h	Q_DECL_OVERRIDE -> override	2017-03-02 20:39:24 +01:00
debug_txt.h	Use categorized logging even more	2014-09-16 23:38:25 +02:00
document.cpp	Only show warning messages by default	2017-01-16 18:41:33 +01:00
document.h	Fixes suggested by Clazy	2016-10-29 16:33:05 +02:00
generator_txt.cpp	Port to new JSON plugin loading system	2016-01-04 15:59:07 +01:00
generator_txt.h	Q_DECL_OVERRIDE -> override	2017-03-02 20:39:24 +01:00
libokularGenerator_txt.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-12 04:21:17 +02:00
Messages.sh	Some i18n fixes	2013-05-19 10:59:43 +03:00
okularApplication_txt.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-21 04:36:10 +02:00
okularTxt.desktop	Preview functions again.	2016-07-21 23:05:54 +02:00
org.kde.mobile.okular_txt.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-04 06:23:35 +01:00
org.kde.okular-txt.metainfo.xml	GIT_SILENT made messages (after extraction)	2017-05-12 02:59:10 +02:00