l10n daemon script 7be388fa0f 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"		2015-08-31 04:47:52 +00:00
..
CMakeLists.txt	Compile++	2013-11-04 21:38:52 +01:00
converter.cpp	compile++	2013-11-04 21:49:32 +01:00
converter.h	compile++	2013-11-04 21:49:32 +01:00
generator_mobi.cpp	Minor version updates to generators with changes since 4.12	2014-04-09 23:39:04 +02:00
generator_mobi.h	compile++	2013-11-04 21:49:32 +01:00
libokularGenerator_mobi.desktop	SVN_SILENT made messages (.desktop file)	2014-12-26 04:18:45 +00:00
Messages.sh	Merge mobipocket generator plugin.	2013-11-04 16:29:33 -03:00
mobidocument.cpp	Ultra ugly hack for getting links to be blue unless css'ed	2014-03-12 23:07:31 +01: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	2015-08-31 04:47:52 +00:00
okularMobi.desktop	SVN_SILENT made messages (.desktop file)	2014-12-26 04:18:45 +00:00