kwin/kcmkwin
l10n daemon script b6f22a98a7 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"
2018-06-18 07:51:12 +02:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:51:12 +02:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:51:12 +02:00
kwindesktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-20 07:06:47 +01:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-28 04:45:41 +01:00
kwinrules [kcmkwin/rules] Disable detect button on Wayland 2018-03-04 09:43:03 +01:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:51:12 +02:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:51:12 +02:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:51:12 +02:00
CMakeLists.txt