Commit graph

3 commits

Author SHA1 Message Date
l10n daemon script
4060e048f5 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"
2015-03-21 04:21:58 +00:00
l10n daemon script
f8ba80c7f3 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"
2015-03-20 04:31:37 +00:00
Aleix Pol
d3a379386e Install a desktop file to use the plasmoid in a windowed mode
It uses a --statusnotifier modifier that will be available since
plasma 5.2 that will place it in the system tray.
2014-11-10 04:02:03 +01:00