l10n daemon script c9440a9160 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"		2020-11-25 06:34:22 +01:00
..
tests	New part/ directory for okularpart sources from /, ui/, conf/	2020-11-18 19:32:56 +00:00
CMakeLists.txt	New part/ directory for okularpart sources from /, ui/, conf/	2020-11-18 19:32:56 +00:00
generator_kimgio.cpp	Run clang-format	2020-07-11 09:17:33 +02:00
generator_kimgio.h	Run clang-format	2020-07-11 09:17:33 +02:00
libokularGenerator_kimgio.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-11-25 06:34:22 +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	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-17 06:04:22 +02:00
okularKimgio.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-17 06:04:22 +02:00
org.kde.mobile.okular_kimgio.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-17 06:04:22 +02:00
org.kde.okular-kimgio.metainfo.xml	GIT_SILENT made messages (after extraction)	2020-11-25 02:20:39 +01:00