Author: l10n daemon script
Revision Date: 2019-12-05 04:21:18 UTC

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"

Author: Kurt Hindenburg
Revision Date: 2013-07-19 13:40:31 UTC

remove unused icon folder

kde4_add_app_icon on MacOSX will recursively find all icons and having
icons-old subfolder causes cmake to fail

(cherry picked from commit 195c2a3e002f1a9371cc86d8c78d64a0c9c30e9d)