l10n daemon script 44f04e5c56 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-11-08 06:24:01 +01:00
..
CMakeLists.txt	Use KDEInstallDirs to insert paths into kwinwrapper	2019-12-10 14:26:03 +00:00
kwinwrapper.in	Set PLASMA_INTEGRATION_USE_PORTAL=1	2020-09-18 16:27:51 +02:00
plasma-mobile.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-11-08 06:24:01 +01:00