Diffusion Plasma Workspace c2cf24733251

Merge branch 'Plasma/5.1'
c2cf24733251
Actions

Authored by graesslin on Oct 20 2014, 6:15 AM.

Description

Merge branch 'Plasma/5.1'

Conflicts:
applets/icontasks/plasma-applet-org.kde.plasma.icontasks.desktop
kcms/access/kcmaccess.desktop
kcms/lookandfeel/autotests/lookandfeel/metadata.desktop
kcms/lookandfeel/kcm_lookandfeel.desktop
kcms/lookandfeel/package/metadata.desktop
layout-templates/org.kde.plasma.desktop.defaultPanel/metadata.desktop

Details

Committed
graesslinOct 20 2014, 6:15 AM
Parents
R120:1e4d2c536188: SVN_SILENT made messages (.desktop file)
R120:bf774be27974: SVN_SILENT made messages (.desktop file)
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
1e4d2c536188l10n daemon script
SVN_SILENT made messages (.desktop file) 
Oct 18 2014

Empty Commit

This commit is empty and does not affect any paths.