l10n daemon script dc447860be 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"		2017-04-25 10:05:35 +02:00
..
CMakeLists.txt	[kcmkwin] Add a new config module for touch screen gestures	2017-04-07 16:18:46 +02:00
kwinscreenedges.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 04:37:53 +01:00
kwintouchscreen.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-25 10:05:35 +02:00
main.cpp	Allow configuring script's screen edges from the KCM	2016-10-07 15:20:14 +01:00
main.h	Allow configuring script's screen edges from the KCM	2016-10-07 15:20:14 +01:00
main.ui
Messages.sh
monitor.cpp	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
monitor.h
screenpreviewwidget.cpp
screenpreviewwidget.h
touch.cpp	[kcmkwin] Fix saving of TouchScreen actions	2017-04-08 10:56:37 +02:00
touch.h	[kcmkwin] Add a new config module for touch screen gestures	2017-04-07 16:18:46 +02:00
touch.ui	[kcmkwin] Add a new config module for touch screen gestures	2017-04-07 16:18:46 +02:00