l10n daemon script bd3083e81f 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"		2016-01-30 09:40:55 +00:00
..
CMakeLists.txt
mouseclick.cpp	[effects] Use shader trait api in MouseClick	2016-01-25 14:11:54 +01:00
mouseclick.h
mouseclick.kcfg
mouseclick_config.cpp
mouseclick_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-30 09:40:55 +00:00
mouseclick_config.h
mouseclick_config.ui
mouseclickconfig.kcfgc