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	KCM KWin ScreenEdge and TouchScreenEdge use KCModuleData	2020-11-03 13:36:46 +01:00
kwinscreenedge.cpp
kwinscreenedge.h
kwinscreenedgeconfigform.cpp	KCM KWin Manage default Highlight indicator for settings not handled by KCModule	2020-09-30 09:10:23 +02:00
kwinscreenedgeconfigform.h	KCM KWin Manage default Highlight indicator for settings not handled by KCModule	2020-09-30 09:10:23 +02:00
kwinscreenedges.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwinscreenedgescriptsettings.kcfg
kwinscreenedgescriptsettings.kcfgc
kwinscreenedgesettings.kcfg	KCM KWin ScreenEdge and TouchScreenEdge use KCModuleData	2020-11-03 13:36:46 +01:00
kwinscreenedgesettings.kcfgc
kwintouchscreen.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwintouchscreenedgeconfigform.cpp
kwintouchscreenedgeconfigform.h
kwintouchscreenscriptsettings.kcfg
kwintouchscreenscriptsettings.kcfgc
kwintouchscreensettings.kcfg	[kcmkwin/kwinscreenedges] Disable left touch edge by default	2020-11-20 14:25:15 +00:00
kwintouchscreensettings.kcfgc
main.cpp	KCM KWin ScreenEdge and TouchScreenEdge use KCModuleData	2020-11-03 13:36:46 +01:00
main.h	KCM KWin ScreenEdge and TouchScreenEdge use KCModuleData	2020-11-03 13:36:46 +01:00
main.ui
Messages.sh
monitor.cpp
monitor.h
screenpreviewwidget.cpp
screenpreviewwidget.h
touch.cpp	KCM KWin ScreenEdge and TouchScreenEdge use KCModuleData	2020-11-03 13:36:46 +01:00
touch.h	KCM KWin ScreenEdge and TouchScreenEdge use KCModuleData	2020-11-03 13:36:46 +01:00
touch.ui