l10n daemon script ea05ac380b 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-06-26 05:41:33 +02:00
..
CMakeLists.txt
kwinscreenedges.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-26 05:11:05 +02:00
kwintouchscreen.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-26 05:41:33 +02: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