Diffusion KWin cdc743b8f420

Merge branch 'KDE/4.11'

Authored by luebking on Jan 30 2014, 7:55 PM.

Description

Merge branch 'KDE/4.11'

Conflicts:
kwin/effects/mouseclick/mouseclick.cpp
plasma/generic/scriptengines/python/plasma-scriptengine-dataengine-python.desktop
plasma/generic/scriptengines/python/plasma-scriptengine-runner-python.desktop
plasma/generic/scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop
plasma/generic/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop

Merged Changes

CommitAuthorDetailsCommitted
97a6676a4fa9luebking
depend noborder on motif_noborder after reshape 
Jan 30 2014
ce32856c8543luebking
mouseclick FX, don't collect clicks unless active 
Jan 30 2014
c8713ce095f3l10n daemon script
SVN_SILENT made messages (.desktop file) 
Jan 30 2014