l10n daemon script c855555903 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-13 04:11:59 +01:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
glide.cpp	[effects] Improve interaction between Glide and SlidingPopups effect	2016-11-16 09:05:41 +01:00
glide.h	[effects] Improve interaction between Glide and SlidingPopups effect	2016-11-16 09:05:41 +01:00
glide.kcfg	Use KConfigXT in Glide Effect	2012-09-14 10:39:28 +02:00
glide_config.cpp	Do not register dbus service org.kde.kwin.Effects	2014-05-15 10:55:29 +02:00
glide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 04:11:59 +01:00
glide_config.h	Use KConfigXT in Glide Effect	2012-09-14 10:39:28 +02:00
glide_config.ui	Fix warnings in kwin/effects/glide/glide_config.ui	2014-12-05 20:07:37 +01:00
glideconfig.kcfgc	Use KConfigXT in Glide Effect	2012-09-14 10:39:28 +02:00