l10n daemon script cd34059f53 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"		2015-10-08 04:21:25 +00:00
..
CMakeLists.txt	Pass the command line options properly when using tabs or unique instances	2014-08-08 22:35:53 +02:00
main.cpp	Fix session restore/save with multiple tabs	2015-03-16 23:55:57 +01:00
okular.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-08 04:21:25 +00:00
okular_main.cpp	Fix error messags on cmdline arguments	2015-03-30 20:05:40 +02:00
okular_main.h	Don't you hate it when you forget files?	2014-08-08 22:39:53 +02:00
shell.cpp	Fix crash on startup when okularpart can't be found	2015-08-03 12:58:30 +02:00
shell.h	New shortcut to resize window to fit page	2015-03-17 00:20:11 +01:00
shell.rc	Move the open new files in tabs setting to configure dialog	2014-02-08 12:15:15 +01:00
shellutils.cpp	Pass the command line options properly when using tabs or unique instances	2014-08-08 22:35:53 +02:00
shellutils.h	Pass the command line options properly when using tabs or unique instances	2014-08-08 22:35:53 +02:00