l10n daemon script 4c83a3e422 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"		2022-05-15 01:57:29 +00:00
..
CMakeLists.txt	Use undeprecated install dirs	2022-04-21 01:27:43 +00:00
kwinwrapper.in
plasma-mobile.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-05-15 01:57:29 +00:00