kwin/kcmkwin
l10n daemon script 9b448f43aa 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-06-20 09:22:28 +02:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2019-04-06 09:35:59 +02:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-22 09:03:46 +01:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-16 09:09:19 +01:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2019-06-20 09:22:28 +02:00
kwinrules SVN_SILENT made messages (.desktop file) - always resolve ours 2019-06-20 09:22:28 +02:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2019-04-08 09:15:36 +02:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-16 09:09:19 +01:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-16 09:09:19 +01:00
CMakeLists.txt