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
..
CMakeLists.txt	use reverse domain-name scheme for metainfo.xml files	2016-11-04 22:47:28 +01:00
debug_comicbook.h	Add missing debug_comicbook.h	2014-09-17 19:46:42 +02:00
directory.cpp	s/auto_ptr/unique_ptr/	2015-07-20 16:14:01 +02:00
directory.h	Fix build with Qt 5.5 branch.	2015-03-02 13:09:27 +01:00
document.cpp	Merge remote-tracking branch 'origin/master' into frameworks	2016-10-29 11:13:24 +02:00
document.h	Merge pages, pageSize and extractImageFiles.	2011-11-09 10:53:47 -05:00
generator_comicbook.cpp	Only show warning messages by default	2017-01-16 18:41:33 +01:00
generator_comicbook.h	Q_DECL_OVERRIDE -> override	2017-03-02 20:39:24 +01:00
libokularGenerator_comicbook.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-12 04:21:17 +02:00
Messages.sh	now the comicbook backend has messages, so extract them	2008-03-16 18:10:19 +00:00
okularApplication_comicbook.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-21 04:36:10 +02:00
okularComicbook.desktop	Preview functions again.	2016-07-21 23:05:54 +02:00
org.kde.mobile.okular_comicbook.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-04 06:23:35 +01:00
org.kde.okular-comicbook.metainfo.xml	GIT_SILENT made messages (after extraction)	2017-05-12 02:59:10 +02:00
qnatsort.cpp	generators: Fix build without implicit cast to/from ascii	2016-07-11 21:59:14 +02:00
qnatsort.h	typos	2008-10-16 18:54:01 +00:00
unrar.cpp	generators: Fix build without implicit cast to/from ascii	2016-07-11 21:59:14 +02:00
unrar.h	Port from KTempDir to QTemporaryDir.	2014-10-14 15:17:20 +02:00
unrarflavours.cpp	Use QStringLiteral	2015-10-29 13:37:11 +01:00
unrarflavours.h	Q_DECL_OVERRIDE -> override	2017-03-02 20:39:24 +01:00