kwin/effects/showpaint
l10n daemon script a5b03f74ee 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-11-01 05:58:11 +01:00
..
CMakeLists.txt [effects/showpaint] Use a shortcut to toggle the effect 2018-09-28 20:12:22 +03:00
showpaint.cpp [effects/showpaint] Use a shortcut to toggle the effect 2018-09-28 20:12:22 +03:00
showpaint.h [effects/showpaint] Use a shortcut to toggle the effect 2018-09-28 20:12:22 +03:00
showpaint_config.cpp [effects/showpaint] Use a shortcut to toggle the effect 2018-09-28 20:12:22 +03:00
showpaint_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-01 05:58:11 +01:00
showpaint_config.h [effects/showpaint] Use a shortcut to toggle the effect 2018-09-28 20:12:22 +03:00
showpaint_config.ui [effects/showpaint] Use a shortcut to toggle the effect 2018-09-28 20:12:22 +03:00