mirror of
https://invent.kde.org/graphics/okular
synced 2024-10-01 21:53:41 +00:00
cd34059f53
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" |
||
---|---|---|
.. | ||
tests | ||
active-documentviewer_kimgio.desktop | ||
CMakeLists.txt | ||
generator_kimgio.cpp | ||
generator_kimgio.h | ||
gui.rc | ||
libokularGenerator_kimgio.desktop | ||
Messages.sh | ||
okularApplication_kimgio.desktop | ||
okularKimgio.desktop |