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

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

From Revision 6071 to 6052

Rev	Summary	Authors	Date
6071	Fix CMake module search Fix CMake module search The local cmake modules should, in this case, be preferred compared to the ones in ECM, or the build will not be probably configured, causing includes not to be found, and thus ending up in failure.	Luca Beltrame	3 years ago
6070	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	3 years ago
6069	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script	3 years ago
6068	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	3 years ago
6067	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script	3 years ago
6066	GIT_SILENT Update Appstream for new release GIT_SILENT Update Appstream for new release (cherry picked from commit a4bbd2308cf33b9ab8d91e9d292d83234ec2e24e)	Christoph Feck	3 years ago
6065	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	3 years ago
6064	GIT_SILENT: add K3b icon as repository logo GIT_SILENT: add K3b icon as repository logo	Yuri Chornoivan	3 years ago
6063	GIT_SILENT: we don't use phabricator now GIT_SILENT: we don't use phabricator now	Laurent Montel	3 years ago
6062	GIT_SILENT Update Appstream for new release GIT_SILENT Update Appstream for new release (cherry picked from commit 10d4e56e612b35cfc4e757f9ff831712dd31f3d8)	Christoph Feck	3 years ago
6061	Merge branch 'release/20.04' Merge branch 'release/20.04'	Albert Astals Cid	3 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

Older »