kwin/kcmkwin
l10n daemon script 49b5e227fb 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"
2020-02-09 09:36:06 +01:00
..
common Update my email address 2020-01-14 18:17:18 +02:00
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-09 09:36:06 +01:00
kwindecoration [decoration] Implement the size property 2020-01-28 18:42:17 +02:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-09 09:36:06 +01:00
kwineffects SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-09 09:36:06 +01:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-09 09:36:06 +01:00
kwinrules
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-09 09:36:06 +01:00
kwinscripts
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2020-01-04 06:12:32 +01:00
CMakeLists.txt