l10n daemon script 844be8376e 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"		2021-06-28 01:31:11 +00:00
..
CMakeLists.txt	Use KDEInstallDirs to insert paths into kwinwrapper	2019-12-10 14:26:03 +00:00
kwinwrapper.in	Drop un-needed environment variables	2021-02-15 16:35:18 +05:30
plasma-mobile.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-06-28 01:31:11 +00:00