l10n daemon script a1c0d43deb 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-07-23 06:10:20 +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-07-23 06:10:20 +02:00
main.cpp
Messages.sh
module.cpp	kcmkwin/scripts: make default button work	2020-03-13 11:08:56 +01:00
module.h	Use more traditional doxygen style	2019-07-29 22:06:19 +03:00
module.ui
version.h.cmake