l10n daemon script c85a2227b7 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"		2019-10-23 09:29:41 +02:00
..
CMakeLists.txt	Use SERVICE_TYPES parameter to kcoreaddons_desktop_to_json()	2015-12-09 23:42:45 +00:00
glide.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
glide.h	[effects] Improve interaction between Glide and SlidingPopups effect	2016-11-16 09:05:41 +01:00
glide.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
glide_config.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
glide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:29:41 +02:00
glide_config.h
glide_config.ui
glideconfig.kcfgc