l10n daemon script 3b3aa82f58 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"		2018-07-23 05:24:40 +02:00
..
blur.cpp	[effects/blur] Clean up shader code	2018-06-18 15:50:52 +03:00
blur.h
blur.kcfg
blur_config.cpp
blur_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
blur_config.h
blur_config.ui
blurconfig.kcfgc
blurshader.cpp	[effects/blur] Clean up shader code	2018-06-18 15:50:52 +03:00
blurshader.h	[effects/blur] Clean up shader code	2018-06-18 15:50:52 +03:00
CMakeLists.txt