l10n daemon script 99237c9b3f 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"		2015-06-01 10:08:03 +00:00
..
CMakeLists.txt
mouseclick.cpp	Add disambiguation context	2015-04-17 15:56:58 +03:00
mouseclick.h
mouseclick.kcfg
mouseclick_config.cpp
mouseclick_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-01 10:08:03 +00:00
mouseclick_config.h
mouseclick_config.ui
mouseclickconfig.kcfgc