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
magiclamp.cpp	[kwin] Port away from deprected KCoreConfigSkeleton::readConfig	2014-03-25 16:29:03 +01:00
magiclamp.h	[kwin] Add a virtual Effect::requestedEffectChainPosition	2014-03-28 14:04:54 +01:00
magiclamp.kcfg	Use KConfigXT in MagicLamp effect	2012-09-19 09:29:27 +02:00
magiclamp_config.cpp	Do not register dbus service org.kde.kwin.Effects	2014-05-15 10:55:29 +02:00
magiclamp_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-30 09:40:55 +00:00
magiclamp_config.h	Use Q_SLOTS and Q_SIGNALS instead of slots and signals	2013-07-24 09:46:54 +02:00
magiclamp_config.ui	Use KConfigXT in MagicLamp effect	2012-09-19 09:29:27 +02:00
magiclampconfig.kcfgc	Use KConfigXT in MagicLamp effect	2012-09-19 09:29:27 +02:00