l10n daemon script 237d52be01 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-10-09 06:39:13 +02:00
..
CMakeLists.txt
kwinscripts.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-10-09 06:39:13 +02:00
kwinscripts.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
main.cpp	Prettify license headers	2020-08-07 19:57:56 +00:00
Messages.sh
module.cpp	Clear plugins after changing KNS entires	2020-08-31 06:35:42 +00:00
module.h	Prettify license headers	2020-08-07 19:57:56 +00:00
module.ui
version.h.cmake