l10n daemon script 2bb025cbdb 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"		2019-11-02 05:41:14 +01: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	2019-10-17 05:41:38 +02:00
kwinscripts.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
main.cpp
Messages.sh
module.cpp
module.h	Use more traditional doxygen style	2019-07-29 22:06:19 +03:00
module.ui	[KCMs] move GHNS buttons to the normal location	2018-10-31 07:29:22 -06:00
version.h.cmake