l10n daemon script c10fe06d06 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-18 05:44:57 +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-06-18 05:44:57 +02:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00