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
..
tests	Ensure KImageIO test always finds the currently built generator	2015-08-14 01:30:32 +01:00
CMakeLists.txt	Fix installation of kimgio plugin	2016-01-30 18:21:48 +01:00
generator_kimgio.cpp	Remove kdelibs4support from the generator plugins	2016-01-30 16:51:46 +01:00
generator_kimgio.h	Don't rotate images with Qt 5.4.0 and 5.4.1	2015-08-15 19:28:06 +01:00
libokularGenerator_kimgio.json	Add the Copyright information back to the JSON files	2016-01-04 15:59:07 +01:00
Messages.sh	do not rely on extract-messages.sh doing the work for us	2010-08-21 16:43:14 +00:00
okularApplication_kimgio.desktop	Merge branch 'master' into frameworks	2016-02-22 03:50:54 -08:00
org.kde.mobile.okular_kimgio.desktop	Merge branch 'master' into frameworks	2016-02-22 03:50:54 -08:00