plasma-workspace

Commit Graph

Author	SHA1	Message	Date
l10n daemon script	bbc1b685ae	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
Noah Davis	ffc47c6e22	Change icons for Activities dataengine and runner Summary: KCMs should have color icons while widgets should have monochrome icons, so I have changed the name of the KCM icon. Depends on D18529 Reviewers: #vdg, #plasma, ngraham Reviewed By: #vdg, ngraham Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D18532	7 years ago
l10n daemon script	7383a93e21	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
l10n daemon script	b21e262bb9	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
l10n daemon script	ec7f62b766	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
l10n daemon script	4434af7725	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
l10n daemon script	5d6410de38	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
l10n daemon script	c996c13c53	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	8ad9c6ba90	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	bd633d8289	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	5101b0b5f9	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	0e35c812b0	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	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	fb88c728e1	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	2569d35ff4	SVN_SILENT made messages (.desktop file)	11 years ago
l10n daemon script	5e058803f7	SVN_SILENT made messages (.desktop file)	11 years ago
Sebastian Kügler	8804c1bbe1	Streamline name of activities engine's desktop file	12 years ago
l10n daemon script	6ef6c7e692	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
l10n daemon script	f6fa9c9cd7	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	7340ee7972	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	02b92c46d5	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	55744e1106	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	bc51c4f2b0	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	c12cad775c	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	8356528abc	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	0054ac7f20	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	a80ea24203	SVN_SILENT made messages (.desktop file)	12 years ago
l10n daemon script	de65f94f1d	SVN_SILENT made messages (.desktop file)	12 years ago
Aleix Pol	da27b27678	Initial import from the monolithic kde-workspace. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the techbase wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://community.kde.org/Frameworks/GitOldHistory If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo kde-workspace, frameworks branch, at commit 049113e719dd2fc4446d054fa1a3aada330094f0	12 years ago

17 Commits (2fffd036fccfbd1dca8c62ec1f5ccdff5cc8dd0c)