kwin/kcmkwin
l10n daemon script 3ac94df26d 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-26 07:21:11 +02:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-26 07:21:11 +02:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:25:30 +02:00
kwindesktop
kwinoptions
kwinrules Revert "Add "SkipSwitcher" to API" 2018-04-28 09:26:51 +02:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-25 07:18:34 +02:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:25:30 +02:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 07:25:30 +02:00
CMakeLists.txt