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 c342be5961 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
mouseclick.cpp
mouseclick.h
mouseclick.kcfg
mouseclick_config.cpp
mouseclick_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
mouseclick_config.h
mouseclick_config.ui
mouseclickconfig.kcfgc