l10n daemon script 30b516eceb 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-09-30 06:16:48 +02:00
..
CMakeLists.txt	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
kwinscripts.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 06:10:20 +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	Import of a KCM for KWin scripts	2011-12-21 07:28:51 +01:00
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	[KCMs] move GHNS buttons to the normal location	2018-10-31 07:29:22 -06:00
version.h.cmake	Import of a KCM for KWin scripts	2011-12-21 07:28:51 +01:00