l10n daemon script c0f994dafc 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-07-07 08:33:47 +02:00
..
common	[kcmkwin] Actually save effect settings	2019-04-10 11:40:46 +03:00
kwincompositing
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-07 08:33:47 +02:00
kwindesktop
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 08:54:54 +02:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-20 08:54:54 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-08 05:54:38 +02: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