kwin/kcmkwin/kwinscreenedges
l10n daemon script 64786630a5 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"
2020-01-29 05:45:29 +01:00
..
CMakeLists.txt Change project name to "KWin" 2020-01-25 03:05:02 +02:00
kwinscreenedges.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-01-29 05:45:29 +01:00
kwintouchscreen.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-01-29 05:45:29 +01:00
main.cpp Remove some unused includes 2019-11-10 20:26:35 +01:00
main.h
main.ui
Messages.sh
monitor.cpp
monitor.h Use nullptr everywhere 2019-09-19 17:48:21 +03:00
screenpreviewwidget.cpp
screenpreviewwidget.h
touch.cpp Remove some unused includes 2019-11-10 20:26:35 +01:00
touch.h
touch.ui