Diffusion KWin fecb8ec7fff8

Merge branch 'KDE/4.11'

Authored by rakuco on Oct 20 2013, 2:42 PM.

Description

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

Merged Changes

CommitAuthorDetailsCommitted
34f28508910crakuco
Remove assertion in KDecorationUnstable's constructor. 
Oct 20 2013
2b5963a3de37C Schell/graesslin
Fix zoom effect cursor position on initial zoom in. 
Oct 10 2013
c29ab9631180l10n daemon script
SVN_SILENT made messages (.desktop file) 
Oct 9 2013
11801b6545c3graesslin
Don't show borders for a maximized Laptop client 
Oct 8 2013
746163f4d09egraesslin
Always use PositionCenter for maximized windows 
Oct 8 2013