Commit graph

8 commits

Author SHA1 Message Date
l10n daemon script
e8d2bfe884 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"
2016-11-04 09:46:15 +00:00
l10n daemon script
857bc9af3c 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"
2016-10-21 09:30:44 +00:00
l10n daemon script
7391459e8f 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"
2016-10-15 10:01:47 +00:00
l10n daemon script
82d0f49377 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"
2016-10-10 09:46:25 +00:00
l10n daemon script
b78920f905 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"
2016-10-08 09:58:17 +00:00
l10n daemon script
3577e59bc0 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"
2016-10-07 09:31:42 +00:00
Vishesh Handa
df0fd34bc1 Rename satellite to plasma.phone
All interfaces are now consistent and start with 'org.kde.plasma.phone'

Reviewed-By: Marco Martin
2015-06-19 01:48:47 +02:00
Aaron Seigo
e7c2076f67 skeleton of l-n-f package to be filled with content 2014-08-06 10:49:13 +02:00