kwin/src/plugins/kpackage
l10n daemon script a518a4d53b 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"
2022-04-16 01:46:47 +00:00
..
aurorae SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-16 01:46:47 +00:00
decoration SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-16 01:46:47 +00:00
effect SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-16 01:46:47 +00:00
scripts SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-16 01:46:47 +00:00
windowswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-16 01:46:47 +00:00
CMakeLists.txt