kwin/kcmkwin
l10n daemon script e9840c5ba6 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-25 05:20:51 +02:00
..
common [kcmkwin] Actually save effect settings 2019-04-10 11:40:46 +03:00
kwincompositing There's no qml folder here anymore 2019-03-19 22:04:39 +01:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2019-06-25 05:20:51 +02:00
kwindesktop [kcmkwin] Properly load effects 2019-03-18 13:11:24 +02:00
kwineffects Move knsrc files to the new location 2019-05-17 18:56:27 +02:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2019-06-20 05:27:25 +02:00
kwinrules SVN_SILENT made messages (.desktop file) - always resolve ours 2019-06-20 05:27:25 +02:00
kwinscreenedges [kcmkwin/touchscreen+screenedges] Call KRunner KRunner 2019-05-22 12:18:29 -06:00
kwinscripts Move knsrc files to the new location 2019-05-17 18:56:27 +02:00
kwintabbox Move knsrc files to the new location 2019-05-17 18:56:27 +02:00
CMakeLists.txt