l10n daemon script bd3083e81f 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"		2016-01-30 09:40:55 +00:00
..
blur.cpp	[effects] Use passed through matrix in Blur Effect	2016-01-25 15:36:10 +01:00
blur.h	[effects] Use passed through matrix in Blur Effect	2016-01-25 15:36:10 +01:00
blur.kcfg
blur_config.cpp
blur_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-30 09:40:55 +00:00
blur_config.h
blur_config.ui
blurconfig.kcfgc
blurshader.cpp	[effects] Support GLES 3 in Blur and BackgroundContrast	2015-11-09 16:22:32 +01:00
blurshader.h
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00