Merge remote-tracking branch 'origin/KDE/4.14'
Conflicts:
kleopatra/newcertificatewizard/newcertificatewizard.cpp
libkleo/backends/qgpgme/threadedjobmixin.cpp
Description
Description
Details
Details
- Provenance
mlaurent Authored on Jun 26 2015, 7:10 AM - Parents
- rKLEOPATRA2277efd9abd7: Change OpenPGP key defaults to match GnuPG's
rKLEOPATRAaf58200ee49c: Use QStringLiteral - Branches
- Unknown
- Tags
Merged Changes
Merged Changes