l10n daemon script 8725f2441e 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"		2017-03-22 05:17:38 +01:00
..
blur.cpp	Adjust blur and contrast for multi-output rendering on Wayland	2016-10-18 16:38:50 +02:00
blur.h
blur.kcfg
blur_config.cpp
blur_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-22 05:17:38 +01:00
blur_config.h
blur_config.ui
blurconfig.kcfgc
blurshader.cpp
blurshader.h
CMakeLists.txt