l10n daemon script 76d1de48a8 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-08-22 01:17:35 +00:00
..
CMakeLists.txt	Consistently name kpackage structures	2021-08-04 18:42:31 +00:00
kwin-packagestructure-scripts.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-08-22 01:17:35 +00:00
scripts.cpp
scripts.h