kwin/kcmkwin
l10n daemon script 91f5938a7f 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-12-24 05:25:01 +01:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2018-12-24 05:25:01 +01:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-22 06:02:11 +01:00
kwindesktop [kcmkwin/desktop] Disable the OSD duration spinbox if the corresponding checkbox is unchecked 2018-12-23 15:15:20 +02:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2018-12-24 05:25:01 +01:00
kwinrules [kcmkwin/kwinrules] Don't include kdeglobals in rules config 2018-12-19 13:07:50 +00:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-22 06:02:11 +01:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-22 06:02:11 +01:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-22 06:02:11 +01:00
CMakeLists.txt