l10n daemon script 262da1b7c9 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"		2015-04-07 13:20:00 +00:00
..
CMakeLists.txt	Deprecate kservice_desktop_to_json(), use kcoreaddons_desktop_to_json() instead.	2015-01-16 22:52:26 +01:00
magnifier.cpp	Add an internalFormat parameter to the GLTexture ctor	2014-12-30 21:19:49 +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	Do not register dbus service org.kde.kwin.Effects	2014-05-15 10:55:29 +02:00
magnifier_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-07 13:20:00 +00: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