Diffusion KWin fe1520b93d13

Merge branch 'KDE/4.11'

Authored by afiestas on Mar 21 2014, 9:55 AM.

Description

Merge branch 'KDE/4.11'

Conflicts:
kcontrol/desktoppaths/desktoppath.desktop
kcontrol/desktoptheme/desktoptheme.desktop
kcontrol/input/cursortheme.desktop
ksmserver/themes/contour/metadata.desktop
ksmserver/themes/default/metadata.desktop
ksplash/kcm/ksplashthememgr.desktop
kstyles/themes/mega.themerc
libs/ksysguard/processui/ProcessWidgetUI.ui
libs/ksysguard/processui/ksysguardprocesslist.cpp
libs/taskmanager/taskactions.cpp
plasma/generic/runners/solid/plasma-runner-solid.desktop
solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop
solid-actions-kcm/device-actions/solid-device-StorageDrive.desktop

Merged Changes

CommitAuthorDetailsCommitted
8aaeae494cc8l10n daemon script
SVN_SILENT made messages (.desktop file) 
Mar 14 2014

Empty Commit

This commit is empty and does not affect any paths.