kwin/plugins/kpackage
l10n daemon script 2bb025cbdb 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"
2019-11-02 05:41:14 +01:00
..
aurorae SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
decoration SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
effect SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
scripts SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
windowswitcher SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
CMakeLists.txt