kwin/plugins/kpackage/decoration
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
..
CMakeLists.txt Move package structure plugins to plugins dir 2019-03-11 10:57:13 +02:00
decoration.cpp Move package structure plugins to plugins dir 2019-03-11 10:57:13 +02:00
decoration.h Move package structure plugins to plugins dir 2019-03-11 10:57:13 +02:00
kwin-packagestructure-decoration.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00