You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script 30b516eceb 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"
4 years ago
..
CMakeLists.txt
accessibilityintegration.cpp
accessibilityintegration.h
zoom.cpp
zoom.h
zoom.kcfg
zoom_config.cpp
zoom_config.desktop
zoom_config.h
zoom_config.ui
zoomconfig.kcfgc