l10n daemon script 9c0a71c37f 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-07-13 05:18:09 +02:00
..
CMakeLists.txt
kwinscreenedges.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-13 05:18:09 +02:00
kwintouchscreen.desktop
main.cpp
main.h
main.ui
Messages.sh
monitor.cpp	Don't use deprecated QDesktopWidget	2019-07-10 22:50:41 +03:00
monitor.h	Port away from deprecated headers	2019-07-09 23:59:07 +03:00
screenpreviewwidget.cpp
screenpreviewwidget.h
touch.cpp
touch.h
touch.ui