Commit graph

6 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
Martin Klapetek
5dd2df26de [dialer] Use KDE-Im-Phone-Ring sound for ringing 2015-06-19 17:56:58 +02:00
Marco Martin
8b8647ab43 ring with a loop notification 2015-04-28 11:18:56 +02:00
Marco Martin
7050b65686 prettier notifications 2015-04-27 12:06:01 +02:00
Marco Martin
c3f65ad5e8 add a knotification for missed calls 2015-04-26 16:42:14 +02:00