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
magnifier.cpp	[effects] Use color shader traits in magnifier effect	2016-01-25 14:11:54 +01:00
magnifier.h
magnifier.kcfg
magnifier_config.cpp	[effects] Properly set the componentDisplayName on the KActionCollection	2015-08-12 09:40:55 +02:00
magnifier_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-30 09:40:55 +00:00
magnifier_config.h
magnifier_config.ui
magnifierconfig.kcfgc