kwin/kcmkwin/kwincompositing
l10n daemon script 5c51b1c619 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-03-21 09:55:15 +01:00
..
CMakeLists.txt
compositing.cpp
compositing.h
compositing.ui
kwincompositing.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-21 09:55:15 +01:00
main.cpp
Messages.sh