Commit graph

5 commits

Author SHA1 Message Date
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
6686b22212 better name 2014-09-26 21:07:19 +02:00
Aaron Seigo
33ccadbb83 start of shell
had to work through NUMEROUS plasmashell bugs again this week to
get even this far *sgh*
2014-09-03 16:50:41 +02:00