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
blur.h
blur.kcfg	Use KConfigXT in Blur effect	2012-09-15 11:24:11 +02:00
blur_config.cpp
blur_config.desktop
blur_config.h
blur_config.ui
blurconfig.kcfgc
blurshader.cpp
blurshader.h
CMakeLists.txt