l10n daemon script ccd0677bb1 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-06-02 09:47:47 +02:00
..
common	[kcmkwin] Make dialog non blocking	2020-04-07 09:27:31 +01:00
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-05-30 16:31:27 +02:00
kwindecoration	[kcmkwin/kwindecoration] Don't exec() QDialog	2020-05-06 15:15:03 +02:00
kwindesktop	[kcmkwin/kwindesktop] Fix inability to create more than one row on the "Virtual Desktops" settings page	2020-03-29 18:15:05 -06:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-05-12 11:06:12 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-02 09:47:47 +02:00
kwinrules	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-04-29 10:52:05 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
kwintabbox	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00