l10n daemon script 818ed8f4ad 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 05:42:59 +01:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
glide.cpp	Introduce an EffectsHandler::animationsSupported -> bool	2016-08-15 17:38:33 +02:00
glide.h	[effects] Allow Built-In Effects using xcbutils.h	2014-04-28 14:14:20 +02:00
glide.kcfg
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 05:42:59 +01:00
glide_config.h
glide_config.ui	Fix warnings in kwin/effects/glide/glide_config.ui	2014-12-05 20:07:37 +01:00
glideconfig.kcfgc