Raphael Kubo da Costa 54b08b9d9e 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		2013-10-20 17:42:39 +03:00
..
aurorae	Merge branch 'KDE/4.11'	2013-10-20 17:42:39 +03:00
b2	s/KLocale/KLocalizedString/g	2013-03-07 13:59:15 +01:00
laptop	Don't show borders for a maximized Laptop client	2013-10-08 10:15:08 +02:00
oxygen	kde4_add_kcfg_files -> kconfig_add_kcfg_files	2013-10-18 13:55:53 +02:00
CMakeLists.txt	Port Aurorae from KDebug to QDebug	2013-09-02 11:12:14 +02:00
Messages.sh	Remove temporary file	2008-07-02 07:04:51 +00:00