mirror of
https://invent.kde.org/graphics/okular
synced 2024-10-05 23:49:20 +00:00
d6775c6462
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" |
||
---|---|---|
.. | ||
chm | ||
comicbook | ||
djvu | ||
dvi | ||
epub | ||
fax | ||
fictionbook | ||
kimgio | ||
markdown | ||
mobipocket | ||
ooo | ||
plucker | ||
poppler | ||
spectre | ||
tiff | ||
txt | ||
xps | ||
CMakeLists.txt |