l10n daemon script de8e2517e2 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-03-31 07:09:34 +02:00
..
blur.cpp	[effects/blur] Disable texture cache on Wayland	2018-01-15 17:13:08 +01:00
blur.h	Don't recreate kwayland blurmanager on screen size changes	2017-09-29 13:30:54 +01:00
blur.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
blur_config.cpp	[effects/blur] Disable texture cache on Wayland	2018-01-15 17:13:08 +01:00
blur_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-31 07:09:34 +02:00
blur_config.h
blur_config.ui
blurconfig.kcfgc
blurshader.cpp
blurshader.h
CMakeLists.txt	[effects/blur] Disable texture cache on Wayland	2018-01-15 17:13:08 +01:00