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	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
magnifier.cpp	[effects] Save zoom settings using kcfg generated class	2016-11-15 07:19:01 +01:00
magnifier.h	Use Q_SLOTS and Q_SIGNALS instead of slots and signals	2013-07-24 09:46:54 +02:00
magnifier.kcfg	Use KConfigXT in Magnifier Effect	2012-09-19 12:05:21 +02:00
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	2017-03-25 04:37:53 +01:00
magnifier_config.h	Use KConfigXT in Magnifier Effect	2012-09-19 12:05:21 +02:00
magnifier_config.ui	KIntSpinBox -> QSpinBox in kwin/effects configs	2013-09-09 07:38:30 +02:00
magnifierconfig.kcfgc	Use KConfigXT in Magnifier Effect	2012-09-19 12:05:21 +02:00