l10n daemon script 866dfb4e89 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"		2021-01-14 07:04:00 +01:00
..
CMakeLists.txt
kwinscreenedge.cpp
kwinscreenedge.h	Replace remaining usages of old connect syntax with new connect syntax	2020-09-24 09:33:45 +00:00
kwinscreenedgeconfigform.cpp
kwinscreenedgeconfigform.h
kwinscreenedges.desktop
kwinscreenedgescriptsettings.kcfg
kwinscreenedgescriptsettings.kcfgc
kwinscreenedgesettings.kcfg
kwinscreenedgesettings.kcfgc
kwintouchscreen.desktop
kwintouchscreenedgeconfigform.cpp
kwintouchscreenedgeconfigform.h
kwintouchscreenscriptsettings.kcfg
kwintouchscreenscriptsettings.kcfgc
kwintouchscreensettings.kcfg
kwintouchscreensettings.kcfgc
main.cpp
main.h
main.ui
Messages.sh
monitor.cpp
monitor.h
screenpreviewwidget.cpp
screenpreviewwidget.h
touch.cpp
touch.h
touch.ui