~trebelnik-stefina/cinnamon-test/+git/k3b:work/no

Last commit made on 2022-11-04
Get this branch:
git clone -b work/no https://git.launchpad.net/~trebelnik-stefina/cinnamon-test/+git/k3b

Branch merges

Branch information

Recent commits

f23f10a... by Nicolas Fella <email address hidden>

Port away from deprecated KStandardGuiItem::yes/no

Remove the default arguments from the internal API

This forces the callers to pass the semantically appropriate KStandardGuiItem

71eae84... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

4b3ca73... 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"

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

GIT_SILENT Sync po/docbooks with svn

ac85acd... 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"

77d1475... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

56949a9... by l10n daemon script <email address hidden>

GIT_SILENT Sync po/docbooks with svn

7b1e5c8... 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"

88dfdd9... by Blaze

FFMpeg decoder plugin: Correctly handle unsupported formats
in case if some will get past the open procedure (shouldn't happen)

b513434... by Blaze

Port ffmpeg plugin to FFMpeg 5.0 API