kwin/clients/aurorae/src
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
..
lib [aurorae] Fix locating the config file of aurorae themes 2013-10-01 14:05:58 +02:00
qml [aurorae] Change QML for themes to QtQuick 2 2013-10-01 14:05:50 +02:00
aurorae.cpp Merge branch 'KDE/4.11' 2013-10-20 17:42:39 +03:00
aurorae.desktop SVN_SILENT made messages (.desktop file) 2013-05-02 09:17:01 +02:00
aurorae.h Add properties for keepAbove/Below to KDecoration 2013-09-12 09:27:39 +02:00
aurorae.knsrc Aurorae uses KNS3 configuration file. 2010-04-23 16:45:11 +00:00
CMakeLists.txt Change KF5::plasma to KF5::Plasma 2013-10-16 01:36:56 +02:00
colorhelper.cpp Port from KGlobalSettings::contrastF to KColorScheme::contrastF 2013-09-04 16:35:16 +02:00
colorhelper.h Mark most ctors as explicit as reported by Krazy2 checker 2013-01-02 18:35:46 +01:00
decorationoptions.cpp Introduce a dedicated borders element in Aurorae 2013-01-23 07:36:41 +01:00
decorationoptions.h Use uppercase Q_SLOTS/Q_SIGNALS in Aurorae 2013-07-25 17:59:30 +02:00
decorationplugin.cpp [aurorae] Change QML for themes to QtQuick 2 2013-10-01 14:05:50 +02:00
decorationplugin.h [aurorae] Change QML for themes to QtQuick 2 2013-10-01 14:05:50 +02:00
kwindecoration.desktop SVN_SILENT made messages (.desktop file) 2013-08-13 04:19:10 +00:00