l10n daemon script 13d389efd1 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-12-20 13:30:44 +01:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
magiclamp.cpp	[effects] Drop loading shadow config from MagicLamp	2016-11-15 07:19:26 +01:00
magiclamp.h	[effects] Drop loading shadow config from MagicLamp	2016-11-15 07:19:26 +01:00
magiclamp.kcfg
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-12-20 13:30:44 +01: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
magiclampconfig.kcfgc