Merge branch 'KDE/4.11'
- KDE/4.11: Remove assertion in KDecorationUnstable's constructor. SVN_SILENT made messages (.desktop file) Cursor Theme KCM: Show correct resize cursor in preview for themes without a file called "size_fdiag" Fixed missing signal/slot connection: Fix zoom effect cursor position on initial zoom in. SVN_SILENT made messages (.desktop file) Don't show borders for a maximized Laptop client Always use PositionCenter for maximized windows Fix click on trash plasmoid when on desktop and widgets are unlocked
Conflicts:
kwin/clients/aurorae/src/aurorae.cpp
kwin/libkdecorations/kdecoration.cpp
plasma/desktop/applets/trash/trash.cpp
plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop
plasma/desktop/toolboxes/plasma-toolbox-paneltoolbox.desktop
plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop