l10n daemon script 262da1b7c9 SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2015-04-07 13:20:00 +00:00
..
blur.cpp	[effects/blur] Disable cached blur for deleted windows	2015-01-08 09:07:21 +01:00
blur.h
blur.kcfg
blur_config.cpp	Do not register dbus service org.kde.kwin.Effects	2014-05-15 10:55:29 +02:00
blur_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-07 13:20:00 +00:00
blur_config.h
blur_config.ui	allow full range blur strength config in the GUI	2014-06-04 16:30:29 +02:00
blurconfig.kcfgc
blurshader.cpp	[effects] Simplify supported check in blur and backgroundcontrast	2014-06-11 14:50:01 +02:00
blurshader.h	[effects] Simplify supported check in blur and backgroundcontrast	2014-06-11 14:50:01 +02:00
CMakeLists.txt	Deprecate kservice_desktop_to_json(), use kcoreaddons_desktop_to_json() instead.	2015-01-16 22:52:26 +01:00