8027ccd6d6
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" |
||
---|---|---|
.. | ||
blur.cpp | ||
blur.h | ||
blur.kcfg | ||
blur_config.cpp | ||
blur_config.desktop | ||
blur_config.h | ||
blur_config.ui | ||
blurconfig.kcfgc | ||
blurshader.cpp | ||
blurshader.h | ||
CMakeLists.txt |