l10n daemon script
b1348627a0
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"
2018-04-18 05:41:10 +02:00
l10n daemon script
26d9c50a4b
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"
2018-04-10 05:34:06 +02:00
l10n daemon script
a89c13f4d7
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"
2018-04-09 05:18:48 +02:00
l10n daemon script
7367905ecd
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"
2018-04-08 05:30:00 +02:00
l10n daemon script
95512fc2ed
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"
2018-04-06 05:24:44 +02:00
l10n daemon script
0b0b8fbb47
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"
2018-04-05 05:28:20 +02:00
Friedrich W. H. Kossebau
354bd71296
Add template for Plasma wallpaper with QML extension
...
Summary:
Allows to quickly start a new wallpaper which also wants to use a custom QML
extension.
Reviewers: mart
Reviewed By: mart
Subscribers: #frameworks
Tags: #frameworks
Differential Revision: https://phabricator.kde.org/D10849
2018-04-03 16:38:14 +02:00
