mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-13 05:01:30 +00:00
558b4bb765
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" |
||
---|---|---|
.. | ||
.emacs-dirvars | ||
active-documentviewer_xps.desktop | ||
CMakeLists.txt | ||
generator_xps.cpp | ||
generator_xps.h | ||
libokularGenerator_xps.desktop | ||
Messages.sh | ||
okularApplication_xps.desktop | ||
okularXps.desktop |