You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script 6bb9f6db7b 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"
9 years ago
..
CMakeLists.txt
Messages.sh
kwinscreenedges.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
main.cpp Drop PreventScreenLocking electric border 9 years ago
main.h
main.ui
monitor.cpp
monitor.h
screenpreviewwidget.cpp
screenpreviewwidget.h