kwin/kcmkwin
l10n daemon script 72eb1153db 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-08-21 06:15:23 +02:00
..
common Prettify license headers 2020-08-07 19:57:56 +00:00
kwincompositing Prettify license headers 2020-08-07 19:57:56 +00:00
kwindecoration Prettify license headers 2020-08-07 19:57:56 +00:00
kwindesktop Prettify license headers 2020-08-07 19:57:56 +00:00
kwineffects SVN_SILENT made messages (.desktop file) - always resolve ours 2020-08-21 06:15:23 +02:00
kwinoptions Remove unneeded includes of QDesktopWidget 2020-08-14 16:48:19 +02:00
kwinrules Prettify license headers 2020-08-07 19:57:56 +00:00
kwinscreenedges Prettify license headers 2020-08-07 19:57:56 +00:00
kwinscripts Prettify license headers 2020-08-07 19:57:56 +00:00
kwintabbox Fix compiler warning 2020-08-14 16:50:08 +02:00
CMakeLists.txt Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00