kwin/effects/blur
l10n daemon script e61383a198 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 05:20:59 +02:00
..
blur.cpp Added noise blur effect 2018-02-14 00:13:08 +01:00
blur.h Added noise blur effect 2018-02-14 00:13:08 +01:00
blur.kcfg Added noise blur effect 2018-02-14 00:13:08 +01:00
blur_config.cpp Reverted accidental file permission changes 2018-01-26 03:32:33 +09:00
blur_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-31 05:20:59 +02:00
blur_config.h Reverted accidental file permission changes 2018-01-26 03:32:33 +09:00
blur_config.ui Added noise blur effect 2018-02-14 00:13:08 +01:00
blurconfig.kcfgc Reverted accidental file permission changes 2018-01-26 03:32:33 +09:00
blurshader.cpp Added noise blur effect 2018-02-14 00:13:08 +01:00
blurshader.h Added noise blur effect 2018-02-14 00:13:08 +01:00
CMakeLists.txt Reverted accidental file permission changes 2018-01-26 03:32:33 +09:00