l10n daemon script 7c6cabf4a1 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-12-20 06:16:31 +01:00
..
CMakeLists.txt	Use KDEInstallDirs to insert paths into kwinwrapper	2019-12-10 14:26:03 +00:00
kwinwrapper.in	use org.kde.plasma.phoneshell as name	2020-12-15 13:41:08 +01:00
plasma-mobile.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-20 06:16:31 +01:00