l10n daemon script 241bc6525a 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"		2019-02-10 05:27:14 +01:00
..
CMakeLists.txt	Improve searching for KActivities	2018-04-13 17:35:17 +02:00
main.cpp	Fix minor EBN issues	2018-08-31 12:23:45 +03:00
okular_main.cpp	Fix minor EBN issues	2018-08-31 12:23:45 +03:00
okular_main.h	Fix minor EBN issues	2018-08-31 12:23:45 +03:00
org.kde.okular.appdata.xml	GIT_SILENT made messages (after extraction)	2019-01-17 03:14:41 +01:00
org.kde.okular.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-10 05:27:14 +01:00
shell.cpp	Avoid crash during session restore	2018-10-29 21:44:56 +01:00
shell.h	Fix minor EBN issues	2018-09-01 11:25:57 +03:00
shell.rc	Move the open new files in tabs setting to configure dialog	2014-02-08 12:15:15 +01:00
shellutils.cpp	Fix minor EBN issues	2018-08-31 12:23:45 +03:00
shellutils.h	Option to exit after printing	2018-03-03 17:36:50 +01:00