kdenlive:release/22.12

Last commit made on 2023-03-10
Get this branch:
git clone -b release/22.12 https://git.launchpad.net/kdenlive

Branch merges

Branch information

Name:
release/22.12
Repository:
lp:kdenlive

Recent commits

8b9873d... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

c8c9bba... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

8ea463c... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

add1664... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

1d40325... by l10n daemon script <email address hidden>

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"

334b2c7... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

978c978... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

bc019cf... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

cea01b2... by l10n daemon script <email address hidden>

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"

2ab99ff... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn