kwin/effects/zoom
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
..
CMakeLists.txt
zoom.cpp Merge branch 'KDE/4.11' 2013-10-20 17:42:39 +03:00
zoom.desktop SVN_SILENT made messages (.desktop file) 2013-06-10 03:46:39 +00:00
zoom.h Use Q_SLOTS and Q_SIGNALS instead of slots and signals 2013-07-24 09:46:54 +02:00
zoom.kcfg
zoom_config.cpp KIcon -> QIcon::fromTheme in kwin effects 2013-09-05 10:29:33 +02:00
zoom_config.desktop SVN_SILENT made messages (.desktop file) 2013-06-10 03:46:39 +00:00
zoom_config.h Use Q_SLOTS and Q_SIGNALS instead of slots and signals 2013-07-24 09:46:54 +02:00
zoom_config.ui Use KShortcutsEditor directly instead of subclass 2013-09-09 06:57:06 +02:00
zoomconfig.kcfgc