okular/shell
l10n daemon script d85fe1df64 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"
2018-08-04 07:49:58 +02:00
..
CMakeLists.txt Improve searching for KActivities 2018-04-13 17:35:17 +02:00
main.cpp Do not duplicate work of KAboutData::setupCommandLine() 2018-06-21 13:39:36 +02:00
okular_main.cpp Readd test for file existance when opening files with # on the path 2017-01-16 00:33:25 +01:00
okular_main.h Don't you hate it when you forget files? 2014-08-08 22:39:53 +02:00
org.kde.okular.appdata.xml GIT_SILENT made messages (after extraction) 2018-08-04 06:27:24 +02:00
org.kde.okular.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-04 07:49:58 +02:00
shell.cpp Allow to select more than one file in the 'open file' dialog 2018-06-25 17:11:51 +02:00
shell.h Merge remote-tracking branch 'origin/master' into dont-use-docdata-for-annots-and-forms 2017-09-11 19:51:51 +02:00
shell.rc Move the open new files in tabs setting to configure dialog 2014-02-08 12:15:15 +01:00
shellutils.cpp Option to exit after printing 2018-03-03 17:36:50 +01:00
shellutils.h Option to exit after printing 2018-03-03 17:36:50 +01:00