l10n daemon script 6d9ac76cf7 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"		2019-02-15 05:42:11 +01:00
..
CMakeLists.txt
kwinscreenedges.desktop	[kcmkwin] Use new icons for virtual desktops, touch screen, and screen edges KCMs	2019-01-24 14:42:33 -07:00
kwintouchscreen.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-15 05:42:11 +01:00
main.cpp	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
main.h
main.ui	Improve some strings and UI elements in KWin KCM	2017-12-29 10:22:20 -07:00
Messages.sh
monitor.cpp
monitor.h
screenpreviewwidget.cpp
screenpreviewwidget.h
touch.cpp	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
touch.h
touch.ui	Improve some strings and UI elements in KWin KCM	2017-12-29 10:22:20 -07:00