mirror of
https://invent.kde.org/graphics/okular
synced 2024-11-05 18:34:53 +00:00
33a5f67eb2
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 | ||
converter.cpp | ||
converter.h | ||
debug_md.h | ||
generator_md.cpp | ||
generator_md.h | ||
libokularGenerator_md.json | ||
Messages.sh | ||
okularApplication_md.desktop | ||
okularMd.desktop | ||
org.kde.mobile.okular_md.desktop | ||
org.kde.okular-md.metainfo.xml |