kwin/kcmkwin
l10n daemon script 6b0d2fc027 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 05:35:02 +02:00
..
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 05:35:02 +02:00
kwindecoration SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 05:35:02 +02:00
kwindesktop [kcmkwin/kwindesktop] Make Slide effect configurable 2018-06-17 19:38:32 +03:00
kwinoptions Remove Qt module declarations in includes 2018-06-05 18:07:23 +01:00
kwinrules Remove Qt module declarations in includes 2018-06-05 18:07:23 +01:00
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 05:35:02 +02:00
kwinscripts SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 05:35:02 +02:00
kwintabbox SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-18 05:35:02 +02:00
CMakeLists.txt Drop build option KWIN_BUILD_SCREENEDGES 2014-11-24 10:48:49 +01:00