l10n daemon script d8addb6b3a 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"		2018-06-18 07:25:30 +02:00
..
CMakeLists.txt	Port Plasma::Package to KPackage	2016-12-26 17:41:06 +01:00
kwinscripts.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 04:37:53 +01:00
kwinscripts.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 07:25:30 +02:00
main.cpp	Fix build with CMake 3.10	2017-12-18 11:41:37 +01:00
Messages.sh
module.cpp	Remove no longer needed moc include	2017-12-19 02:19:37 +01:00
module.h	[KWin Scripts KCM] Restore "import" option	2017-04-26 17:11:34 +02:00
module.ui	kwinscripts: change i18n string "Get New Scripts..."	2017-10-12 16:46:43 +03:00
version.h.cmake