l10n daemon script 3a75ef844e 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"		2018-11-12 05:53:45 +01:00
..
CMakeLists.txt
zoom.cpp	[effects/zoom] Set wrap mode for cursor texture	2018-10-04 21:40:49 +03:00
zoom.h
zoom.kcfg
zoom_config.cpp
zoom_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-12 05:53:45 +01:00
zoom_config.h
zoom_config.ui
zoomconfig.kcfgc