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
..
tests	generators: Fix build without implicit cast to/from ascii	2016-07-11 21:59:14 +02:00
CMakeLists.txt	Port some missing debug output to categorized logging	2017-01-14 19:15:26 +01:00
generator_kimgio.cpp	Remove #ifdefs for Qt we require in cmake anyway	2017-01-16 00:36:08 +01:00
generator_kimgio.h	Add override	2017-03-02 20:38:50 +01:00
libokularGenerator_kimgio.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-22 04:06:38 +02: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	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-21 04:36:10 +02:00
okularKimgio.desktop	Preview functions again.	2016-07-21 23:05:54 +02:00
org.kde.mobile.okular_kimgio.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-04 06:23:35 +01:00
org.kde.okular-kimgio.metainfo.xml	GIT_SILENT made messages (after extraction)	2017-05-12 02:59:10 +02:00