l10n daemon script f1bbe935d3 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-08-07 05:12:10 +02:00
..
CMakeLists.txt	Move knsrc files to the new location	2019-05-17 18:56:27 +02:00
kwinscripts.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +02:00
kwinscripts.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02: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