l10n daemon script a252ff9656 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"		2018-01-04 04:53:47 +01: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-12-22 05:11:16 +01:00
kwintouchscreen.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-04 04:53:47 +01: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	Improve some strings and UI elements in KWin KCM	2017-12-29 10:22:20 -07: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	Make WindowSwitching (Alt+Tab) the default left touch screen edge	2017-05-02 20:33:21 +02:00
touch.h	[kcmkwin] Add a new config module for touch screen gestures	2017-04-07 16:18:46 +02:00
touch.ui	Improve some strings and UI elements in KWin KCM	2017-12-29 10:22:20 -07:00