l10n daemon script 9265d9fae7 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-06-23 04:36:21 +02:00
..
CMakeLists.txt
kwinscreenedges.desktop
kwintouchscreen.desktop
main.cpp
main.h
main.ui
Messages.sh	Merged "active screen edges" and "active desktop borders" into a single	2009-02-27 15:40:53 +00:00
monitor.cpp
monitor.h
screenpreviewwidget.cpp
screenpreviewwidget.h
touch.cpp
touch.h	[kcmkwin] Add a new config module for touch screen gestures	2017-04-07 16:18:46 +02:00
touch.ui