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
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
glide_config.cpp
glide_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 04:11:59 +01:00
glide_config.h
glide_config.ui
glideconfig.kcfgc