Tag: Branch: Tree: 8a28a6f385

wilder

wilder-5.14

wilder-5.17

wilder-5.18

wilder-5.19

wilder-5.22

wilder-5.24

wilder-5.25

wilder-5.26

wilder-5.26-rebase

wilder-broken-krunner

wilder-portage

wilder-portage-prov

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '8a28a6f385'

${ noResults }

Commit Graph

53 Commits (8a28a6f385416ff9fc38e8a6784cc985fcfbbbe2)

Author	SHA1	Message	Date
l10n daemon script	2aecf659a6	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"	6 years ago
Nicolas Fella	57cfab21ac	Drop empty X-KDE-PluginInfo-Depends ... The whole concept is almost unused and there's no point in having it there but empty See also https://phabricator.kde.org/T13553	6 years ago
l10n daemon script	5f13bcabf9	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"	6 years ago
l10n daemon script	98397d7fd1	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"	6 years ago
l10n daemon script	8fda734647	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"	6 years ago
l10n daemon script	fe7320494b	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"	6 years ago
l10n daemon script	fd832ae350	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"	6 years ago
l10n daemon script	70ad54479f	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"	6 years ago
l10n daemon script	6236df5138	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"	6 years ago
l10n daemon script	f04038a367	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"	6 years ago
l10n daemon script	d0cb0bd49f	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"	6 years ago
l10n daemon script	b547a75572	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"	6 years ago
l10n daemon script	909f9145e7	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"	6 years ago
Laurent Montel	791fb706ed	GIT_SILENT: ignore some files	7 years ago
l10n daemon script	77529c1842	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"	7 years ago
Laurent Montel	ce04cdc185	Fix url	7 years ago
Yuri Chornoivan	ea415539fc	Fix minor EBN issues	8 years ago
Friedrich W. H. Kossebau	3673b9fc93	More consistently use X-KDE-ServiceTypes instead of ServiceTypes	8 years ago
Friedrich W. H. Kossebau	45a19fa16c	Remove long-time deprecated Encoding=UTF-8 from desktop format files ... Summary: The "Encoding" entry had been deprecated in 2006 (https://cgit.freedesktop.org/xdg/xdg-specs/commit/?id=6855384d021d88557f80674798c584c15b547f36) and there is no current workspace known which still requires it being set (incl. Plasma itself). Also has the usage been incomplete and sometimes not at the beginning as required if used (once scripty had sorted all entries in desktop files alphabetically and it was not restored everywhere). Removing them altogether creates consistency and avoids further confusion about and wasted resources for this unused data bit. Removing those entries also from Plasma/5.12 branch avoid conflicts on merging to master, given the entries are often next to translated entries, or generous merging which lets the entries slip back into existance. Reviewers: #plasma, fvogt, broulik, mart Reviewed By: #plasma, mart Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D11563	8 years ago
Friedrich W. H. Kossebau	1564553705	Remove long-time deprecated Encoding=UTF-8 from desktop format files	8 years ago
Friedrich W. H. Kossebau	beefcb1581	Use explicit	8 years ago
Friedrich W. H. Kossebau	2608ccce81	Use nullptr	8 years ago
Laurent Montel	31421a6e5f	Use nullptr	8 years ago
l10n daemon script	e0777cadcc	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"	9 years ago
l10n daemon script	43658f3fd6	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"	9 years ago
l10n daemon script	c3daee69a0	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"	9 years ago
l10n daemon script	50b7c832f3	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"	9 years ago
l10n daemon script	f5546cb5e6	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"	10 years ago
Aleix Pol	96ff1c868e	Properly define overrides as suggested by the c++ standard	10 years ago
l10n daemon script	5435e568df	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"	10 years ago
l10n daemon script	278ba70509	SVN_SILENT made messages (.desktop file)	10 years ago
l10n daemon script	b2173723ce	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"	10 years ago
l10n daemon script	3973041666	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"	10 years ago
l10n daemon script	40f0461650	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"	10 years ago
Montel Laurent	a007f294b4	Use new connect api + QStringLiteral	11 years ago
l10n daemon script	80c1c7eada	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	d3277e8269	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"	11 years ago
l10n daemon script	ef8e9abb33	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	6635cdc956	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"	11 years ago
Montel Laurent	5f9ae5e13c	We depend against kf5-5.8 => ecm > 1.6 => we can use new KDE_ variable	11 years ago
Jonathan Riddell	f1ac30fa83	remove second calls to project() only 1 allowed per cmake project	11 years ago
l10n daemon script	8e3c188f58	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	99bd87a5ad	SVN_SILENT made messages (.desktop file)	11 years ago
David Edmundson	d03b205276	kservice_desktop_to_json -> kcoreaddons_desktop_to_json	11 years ago
l10n daemon script	352e87eec9	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	6ef6c7e692	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	d0c3845cb2	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	e558bc76b9	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	31ad166b6b	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	cf13f672b0	SVN_SILENT made messages (.desktop file)	12 years ago