l10n daemon script ba9aac70b2 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"		2025-07-19 06:10:44 +00:00
..
CMakeLists.txt	kcm: Implement minimal Waydroid support	2025-07-10 12:00:41 -04:00
waydroidhelper.actions	SVN_SILENT made messages (.desktop file) - always resolve ours	2025-07-19 06:10:44 +00:00
waydroidhelper.cpp	Fetch Android ID from Waydroid	2025-07-14 15:46:50 +02:00