l10n daemon script c10fe06d06 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"		2020-06-18 05:44:57 +02:00
..
blur.cpp	Merge branch 'Plasma/5.19'	2020-05-29 10:55:16 +03:00
blur.h	Port KWin to KWaylandServer	2020-04-30 12:56:08 +02:00
blur.kcfg
blur_config.cpp
blur_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
blur_config.h	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
blur_config.ui
blurconfig.kcfgc
blurshader.cpp
blurshader.h
CMakeLists.txt	Reduce the amount of objects that are compiled several times	2020-04-02 00:41:55 +02:00