Home GnuPG
Diffusion Kleopatra 587932d2b27b

Merge remote-tracking branch 'origin/KDE/4.14'
587932d2b27bUnpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
agents/folderarchiveagent.desktop
korgac/korgacagent.desktop
messageviewer/autotests/gravatarconfigwidgettest.cpp
messageviewer/widgets/gravatarconfigwidget.cpp
messageviewer/widgets/gravatarconfigwidget.h

Details

Provenance
mlaurentAuthored on May 15 2015, 3:16 PM
Parents
rKLEOPATRAbf4316d95b6b: SVN_SILENT made messages (.desktop file)
rKLEOPATRA46cb65006c81: SVN_SILENT made messages (.desktop file) - always resolve ours
Branches
Unknown
Tags
Unknown

Event Timeline

Montel Laurent <montel@kde.org> committed rKLEOPATRA587932d2b27b: Merge remote-tracking branch 'origin/KDE/4.14' (authored by Montel Laurent <montel@kde.org>).May 15 2015, 3:16 PM

Merged Changes

Empty Commit

This commit is empty and does not affect any paths.