kwin/src/kcmkwin
l10n daemon script 268d799636 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-11-09 01:22:07 +00:00
..
common Fully port away from KPluginLoader 2021-10-19 21:39:51 +02:00
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2021-11-09 01:22:07 +00:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2021-11-09 01:22:07 +00:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2021-11-09 01:22:07 +00:00
kwineffects SVN_SILENT made messages (.desktop file) - always resolve ours 2021-11-09 01:22:07 +00:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2021-11-09 01:22:07 +00:00
kwinrules SVN_SILENT made messages (.desktop file) - always resolve ours 2021-11-09 01:22:07 +00:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2021-11-09 01:22:07 +00:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2021-11-09 01:22:07 +00:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2021-11-09 01:22:07 +00:00
kwinvirtualkeyboard SVN_SILENT made messages (.desktop file) - always resolve ours 2021-11-09 01:22:07 +00:00
CMakeLists.txt