l10n daemon script be4cde23ec 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"		2017-12-20 07:06:47 +01:00
..
CMakeLists.txt
zoom.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
zoom.h
zoom.kcfg	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
zoom_config.cpp	[effects] Use arg="true" in the kcfg files	2017-04-15 10:03:34 +02:00
zoom_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-20 07:06:47 +01:00
zoom_config.h
zoom_config.ui
zoomconfig.kcfgc