mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-13 05:01:30 +00:00
7381616690
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" |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
main.cpp | ||
okular_main.cpp | ||
okular_main.h | ||
org.kde.okular.appdata.xml | ||
org.kde.okular.desktop | ||
shell.cpp | ||
shell.h | ||
shell.rc | ||
shellutils.cpp | ||
shellutils.h |