l10n daemon script 3a16c16a17 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"		2016-11-05 10:00:05 +00:00
..
CMakeLists.txt	Use QMobipocket >= 2 (Qt5 based)	2016-10-29 18:07:30 +02:00
converter.cpp	generators: Fix build without implicit cast to/from ascii	2016-07-11 21:59:14 +02:00
converter.h	compile++	2013-11-04 21:49:32 +01:00
generator_mobi.cpp	generators: Fix build without implicit cast to/from ascii	2016-07-11 21:59:14 +02:00
generator_mobi.h	Add Q_INTERFACES( Okular::Generator ) to all plugins	2015-05-22 16:33:09 +01:00
libokularGenerator_mobi.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-05 10:00:05 +00:00
Messages.sh	Merge mobipocket generator plugin.	2013-11-04 16:29:33 -03:00
mobidocument.cpp	generators: Fix build without implicit cast to/from ascii	2016-07-11 21:59:14 +02:00
mobidocument.h	Merge mobipocket generator plugin.	2013-11-04 16:29:33 -03:00
okularApplication_mobi.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-04 09:43:54 +00:00
okularMobi.desktop	Preview functions again.	2016-07-21 23:05:54 +02:00
org.kde.mobile.okular_mobi.desktop	Merge branch 'master' into frameworks	2016-02-22 03:50:54 -08:00