~schumski-deactivatedaccount-deactivatedaccount/k3b/master : changes

~schumski-deactivatedaccount-deactivatedaccount/k3b/master » Changes from revision 6061

From Revision 6061 to 6042

Rev	Summary	Authors	Date
6061	Merge branch 'release/20.04' Merge branch 'release/20.04'	Albert Astals Cid	4 years ago
6060	GIT_SILENT Update Appstream for new release GIT_SILENT Update Appstream for new release (cherry picked from commit e30f6f1dc8d412b7b0421b343e94c4f897493f3e)	Christoph Feck	4 years ago
6059	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script	4 years ago
6058	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script	4 years ago
6057	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script	4 years ago
6056	GIT_SILENT Upgrade release service version to 20.07.70. GIT_SILENT Upgrade release service version to 20.07.70.	Albert Astals Cid	4 years ago
6055	Merge remote-tracking branch 'origin/release/19.12' Merge remote-tracking branch 'origin/release/19.12'	Pino Toscano	4 years ago
6054	Merge remote-tracking branch 'origin/release/19.12' Merge remote-tracking branch 'origin/release/19.12'	Albert Astals Cid	4 years ago
6053	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script	4 years ago
6052	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script	4 years ago
6051	ffmpeg: Move a few uses of codec to non-deprecated codecpar ffmpeg: Move a few uses of codec to non-deprecated codecpar It exists at least since 2014 (i got tired of digging backwards) so we're safe	Albert Astals Cid	4 years ago
6050	Remove ifdefs for old ffmpeg versions Remove ifdefs for old ffmpeg versions Like 6 years old or something	Albert Astals Cid	4 years ago
6049	Assume we have avcodec_decode_audio4 if we have ffmpeg Assume we have avcodec_decode_audio4 if we have ffmpeg It was introduced in 2011 after all	Albert Astals Cid	4 years ago
6048	Merge remote-tracking branch 'origin/release/19.12' Merge remote-tracking branch 'origin/release/19.12'	Albert Astals Cid	4 years ago
6047	Merge remote-tracking branch 'origin/release/19.12' Merge remote-tracking branch 'origin/release/19.12'	Albert Astals Cid	4 years ago
6046	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script	4 years ago
6045	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script	4 years ago
6044	Merge remote-tracking branch 'origin/release/19.12' Merge remote-tracking branch 'origin/release/19.12'	Albert Astals Cid	4 years ago
6043	SVN_SILENT made messages (.desktop file) - always resolve ou... 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"	l10n daemon script	4 years ago
6042	Use safe hardcoded value for ProvidersUrl Use safe hardcoded value for ProvidersUrl https://marc.info/?l=kde-core-devel&m=158043297319851&w=2	Yuri Chornoivan	4 years ago

Older »