Home GnuPG
Diffusion Kleopatra 5a88de343efa

Merge remote-tracking branch 'origin/KDE/4.11'
5a88de343efaUnpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

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

Conflicts:
kaddressbook/grantlee/tests/themes/air/theme-air.desktop
kaddressbook/grantlee/tests/themes/simple/theme-simple.desktop
kaddressbook/grantlee/tests/themes/test/theme-test.desktop

Details

Provenance
mlaurentAuthored on Aug 6 2013, 8:04 AM
Parents
rKLEOPATRAb995eddaed40: SVN_SILENT made messages (.desktop file)
rKLEOPATRA4b19312b9a7d: SVN_SILENT made messages (.desktop file)
Branches
Unknown
Tags
Unknown

Event Timeline

Montel Laurent <montel@kde.org> committed rKLEOPATRA5a88de343efa: Merge remote-tracking branch 'origin/KDE/4.11' (authored by Montel Laurent <montel@kde.org>).Aug 6 2013, 8:04 AM

Merged Changes

Empty Commit

This commit is empty and does not affect any paths.