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	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
mouseclick.cpp	[effects] Use shader trait api in MouseClick	2016-01-25 14:11:54 +01:00
mouseclick.h	MouseClick Animation effect supports QPainter Compositor	2014-01-09 13:29:40 +01:00
mouseclick.kcfg	Use KConfigXT in MouseClick Effect	2012-10-26 09:47:22 +02:00
mouseclick_config.cpp	[effects] Properly set the componentDisplayName on the KActionCollection	2015-08-12 09:40:55 +02:00
mouseclick_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-30 09:40:55 +00:00
mouseclick_config.h	Use KConfigXT in MouseClick Effect	2012-10-26 09:47:22 +02:00
mouseclick_config.ui	KFooInput -> Q(Double)SpinBox in mouseclick effect config	2013-09-09 07:47:36 +02:00
mouseclickconfig.kcfgc	Use KConfigXT in MouseClick Effect	2012-10-26 09:47:22 +02:00