kwin/kcmkwin/kwindecoration
l10n daemon script c0f994dafc 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-07-07 08:33:47 +02:00
..
declarative-plugin Update URLs to use https 2019-03-25 19:26:23 +01:00
package SVN_SILENT made messages (.desktop file) - always resolve ours 2019-07-07 08:33:47 +02:00
CMakeLists.txt Move knsrc files to the new location 2019-05-17 18:56:27 +02:00
decorationmodel.cpp
decorationmodel.h
kcm.cpp Resurrect show tooltips option 2019-03-05 00:38:55 +02:00
kcm.h Resurrect show tooltips option 2019-03-05 00:38:55 +02:00
kwindecoration.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-07-07 08:33:47 +02:00
Messages.sh
utils.cpp
utils.h
window-decorations.knsrc