mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-12 20:51:17 +00:00
Merge remote-tracking branch 'origin/KDE/4.12' into KDE/4.13
Conflicts: VERSION core/version.h
This commit is contained in:
commit
67a2a1222c