l10n daemon script 54a72d01ad 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"		2023-08-07 01:48:35 +00:00
..
CMakeLists.txt	Clean up include_directories calls	2021-07-04 00:51:15 +02:00
converter.cpp	emit -> Q_EMIT	2022-03-19 10:58:47 +00:00
converter.h	Convert license headers to SPDX	2021-06-10 08:11:56 +00:00
debug_txt.h	Convert license headers to SPDX	2021-06-10 08:11:56 +00:00
document.cpp	Fixed encoding detection for small texts (up to 3000 bytes)	2021-07-14 21:58:28 +02:00
document.h	Convert license headers to SPDX	2021-06-10 08:11:56 +00:00
generator_txt.cpp	Convert license headers to SPDX	2021-06-10 08:11:56 +00:00
generator_txt.h	Convert license headers to SPDX	2021-06-10 08:11:56 +00:00
libokularGenerator_txt.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-07-31 01:38:24 +00:00
Messages.sh	Some i18n fixes	2013-05-19 10:59:43 +03:00
okularApplication_txt.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-08-07 01:48:35 +00:00
okularTxt.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-04-24 01:43:52 +00:00
org.kde.mobile.okular_txt.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-06-12 01:50:14 +00:00
org.kde.okular-txt.metainfo.xml	GIT_SILENT made messages (after extraction)	2023-08-07 00:45:24 +00:00