Albert Vaca 67f69c8871 Merge branch 'master' into frameworks ... # Conflicts: # CMakeLists.txt # active/app/package/metadata.desktop # conf/widgetannottools.cpp # core/version.h # generators/poppler/libokularGenerator_poppler.desktop # generators/txt/libokularGenerator_txt.desktop # generators/xps/libokularGenerator_xps.desktop # ui/annotationwidgets.cpp # ui/presentationwidget.cpp		2016-02-22 03:50:54 -08:00
..
CMakeLists.txt	Port to new JSON plugin loading system	2016-01-04 15:59:07 +01:00
converter.cpp	Fix includes	2014-10-08 13:37:04 +02:00
converter.h	compile++	2013-11-04 21:49:32 +01:00
generator_mobi.cpp	Port to new JSON plugin loading system	2016-01-04 15:59:07 +01:00
generator_mobi.h	Add Q_INTERFACES( Okular::Generator ) to all plugins	2015-05-22 16:33:09 +01:00
libokularGenerator_mobi.json	Add the Copyright information back to the JSON files	2016-01-04 15:59:07 +01:00
Messages.sh	Merge mobipocket generator plugin.	2013-11-04 16:29:33 -03:00
mobidocument.cpp	Use categorized logging even more	2014-09-16 23:38:25 +02:00
mobidocument.h	Merge mobipocket generator plugin.	2013-11-04 16:29:33 -03:00
okularApplication_mobi.desktop	Merge branch 'master' into frameworks	2016-02-22 03:50:54 -08:00
org.kde.mobile.okular_mobi.desktop	Merge branch 'master' into frameworks	2016-02-22 03:50:54 -08:00