l10n daemon script a4d401c028 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"		2017-06-25 04:33:13 +02:00
..
CMakeLists.txt
kwinscripts.desktop
kwinscripts.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-25 04:33:13 +02:00
main.cpp
Messages.sh
module.cpp	[KWin Scripts KCM] Restore "import" option	2017-04-26 17:11:34 +02:00
module.h	[KWin Scripts KCM] Restore "import" option	2017-04-26 17:11:34 +02:00
module.ui	[KWin Scripts KCM] Restore "import" option	2017-04-26 17:11:34 +02:00
version.h.cmake