l10n daemon script 78c0095a5d 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"		2020-02-11 05:59:16 +01:00
..
CMakeLists.txt	[effects] Remove unneeded link to KService	2019-11-26 17:30:04 +01:00
zoom.cpp	Add some const &	2019-10-30 19:23:01 +01:00
zoom.h	Add some const &	2019-10-30 19:23:01 +01:00
zoom.kcfg
zoom_config.cpp	Port away from overloaded KCModule signal	2019-12-02 09:03:14 +00:00
zoom_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-11 05:59:16 +01:00
zoom_config.h
zoom_config.ui
zoomconfig.kcfgc