l10n daemon script 873a51cc62 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-20 04:17:52 +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-20 04:17:52 +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	Drop KDE4Support in kde-workspace/kwin	2013-12-05 20:24:02 +01:00
Messages.sh	Merged "active screen edges" and "active desktop borders" into a single	2009-02-27 15:40:53 +00:00
monitor.cpp	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
monitor.h	Welcome back KWin screen edges KCM	2013-09-29 10:27:48 +02:00
screenpreviewwidget.cpp	[kwin] Mark unused variables as unused	2014-02-03 11:36:21 +01:00
screenpreviewwidget.h	Make the ScreenPreviewWidget useable again	2013-09-29 10:27:48 +02:00
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