~neon/kompare/master : changes

~neon/kompare/master » Changes from revision 1295

From Revision 1040 to 1021

Rev	Summary	Authors	Date
1040	GIT_SILENT Update Appstream for new release GIT_SILENT Update Appstream for new release (cherry picked from commit 6b053c44f711d2b3237bc748828acfd58cdad6cb)	Heiko Becker	3 years ago
1039	GIT_SILENT Update Appstream for new release GIT_SILENT Update Appstream for new release (cherry picked from commit e1a366cf2dc146b0f2e689cbe8e2ae30ffdf1cf4)	Heiko Becker	3 years ago
1038	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
1037	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
1036	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
1035	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
1034	GIT_SILENT Update Appstream for new release GIT_SILENT Update Appstream for new release (cherry picked from commit e11f15519bd29a623c924f39da192fbeb070e963)	Christoph Feck	3 years ago
1033	Add the diff homepage address to the docs Add the diff homepage address to the docs BUG:430908	Yuri Chornoivan	3 years ago
1032	App: use commits.kde.org/kompare as homepage App: use commits.kde.org/kompare as homepage NO_CHANGELOG	Friedrich W. H. Koss...	3 years ago
1031	Port to new KPluginMetaData-based KParts API Port to new KPluginMetaData-based KParts API NO_CHANGELOG	Friedrich W. H. Koss...	3 years ago
1030	GIT_SILENT Update Appstream for new release GIT_SILENT Update Appstream for new release (cherry picked from commit 9854ab4c3c837265542f055541898eb689533f53)	Christoph Feck	3 years ago
1029	Convert license statements to SPDX expressions Convert license statements to SPDX expressions Also add/move license files as required by REUSE specification	Friedrich W. H. Koss...	3 years ago
1028	Merge branch 'release/20.12' Merge branch 'release/20.12'	Friedrich W. H. Koss...	3 years ago
1027	Reorganize sources into src/ subfolder Reorganize sources into src/ subfolder NO_CHANGELOG	Friedrich W. H. Koss...	3 years ago
1026	Merge branch 'release/20.12' Merge branch 'release/20.12'	Friedrich W. H. Koss...	3 years ago
1025	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script	3 years ago
1024	Merge remote-tracking branch 'origin/release/20.08' Merge remote-tracking branch 'origin/release/20.08'	Heiko Becker	3 years ago
1023	Portaway from Obsolete methods of QPrinter Portaway from Obsolete methods of QPrinter setOrientation -> setPageOrientation QPrinter::Landscape -> QPageLayout::Landscape	Ömer Fadıl USTA	3 years ago
1022	Merge branch 'release/20.08' into master Merge branch 'release/20.08' into master	Friedrich W. H. Koss...	3 years ago
1021	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