l10n daemon script b160c5babb 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"		2017-03-25 04:37:53 +01:00
..
CMakeLists.txt
magnifier.cpp	[effects] Save zoom settings using kcfg generated class	2016-11-15 07:19:01 +01:00
magnifier.h
magnifier.kcfg
magnifier_config.cpp
magnifier_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 04:37:53 +01:00
magnifier_config.h
magnifier_config.ui
magnifierconfig.kcfgc