l10n daemon script e6c6e52253 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"		2021-09-15 01:20:14 +00:00
..
tests	Use the non deprecated version of the PixmapRequest constructor	2021-09-09 16:36:54 +02:00
CMakeLists.txt	Don't require D-Bus on Android	2021-08-20 18:46:50 +00:00
generator_kimgio.cpp	Make meaning of sponsoring note more clear	2021-06-10 08:11:56 +00:00
generator_kimgio.h	Make meaning of sponsoring note more clear	2021-06-10 08:11:56 +00:00
libokularGenerator_kimgio.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-09-15 01:20:14 +00: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	2021-09-10 01:16:35 +00:00
okularKimgio.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-09-10 01:16:35 +00:00
org.kde.mobile.okular_kimgio.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-09-10 01:16:35 +00:00
org.kde.okular-kimgio.metainfo.xml	GIT_SILENT made messages (after extraction)	2021-09-15 00:17:02 +00:00