kwin/plugins/kpackage
l10n daemon script 866dfb4e89 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"
2021-01-14 07:04:00 +01:00
..
aurorae SVN_SILENT made messages (.desktop file) - always resolve ours 2021-01-14 07:04:00 +01:00
decoration SVN_SILENT made messages (.desktop file) - always resolve ours 2021-01-14 07:04:00 +01:00
effect SVN_SILENT made messages (.desktop file) - always resolve ours 2021-01-14 07:04:00 +01:00
scripts SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-30 06:16:48 +02:00
windowswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-30 06:16:48 +02:00
CMakeLists.txt