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
..
conf	Use new KDE_ macro	2015-03-04 07:52:20 +01:00
annots.cpp	Add annotation resize functionality	2017-03-19 23:18:17 +01:00
annots.h	Q_DECL_OVERRIDE -> override	2017-03-02 20:39:24 +01:00
CMakeLists.txt	Set the Okular Form additional actions from the poppler Form additional actions	2017-03-03 01:00:09 +01:00
config-okular-poppler.h.cmake	Set the Okular Form additional actions from the poppler Form additional actions	2017-03-03 01:00:09 +01:00
debug_pdf.h	Use categorized logging even more	2014-09-16 23:38:25 +02:00
formfields.cpp	Set the Okular Form additional actions from the poppler Form additional actions	2017-03-03 01:00:09 +01:00
formfields.h	virtual override -> override	2017-03-02 20:40:09 +01:00
generator_pdf.cpp	Recalculate forms after other are edited	2017-03-03 01:08:44 +01:00
generator_pdf.h	Q_DECL_OVERRIDE -> override	2017-03-02 20:39:24 +01:00
libokularGenerator_poppler.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-12 04:21:17 +02:00
Messages.sh	Renamed dummy extraction file rc_okular_poppler.cpp to usual rc.cpp.	2013-02-27 13:11:33 +01:00
okularApplication_pdf.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-21 04:36:10 +02:00
okularPoppler.desktop	Preview functions again.	2016-07-21 23:05:54 +02:00
org.kde.mobile.okular_pdf.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-04 06:23:35 +01:00
org.kde.okular-poppler.metainfo.xml	GIT_SILENT made messages (after extraction)	2017-05-12 02:59:10 +02:00
popplerembeddedfile.h	Add override	2017-03-02 20:38:50 +01:00