l10n daemon script 8dfd4c04dd 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 07:12:23 +02:00
..
blur.cpp	Fix multimonitor blur	2018-06-18 19:05:23 +01:00
blur.h	Fix multimonitor blur	2018-06-18 19:05:23 +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-07-23 07:12:23 +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	Fix multimonitor blur	2018-06-18 19:05:23 +01:00
blurshader.h	Fix multimonitor blur	2018-06-18 19:05:23 +01:00
CMakeLists.txt	Reverted accidental file permission changes	2018-01-26 03:32:33 +09:00