l10n daemon script
|
b79bb13450
|
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"
|
2017-07-30 04:56:37 +02:00 |
|
l10n daemon script
|
5b5f17ae2b
|
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"
|
2017-06-24 04:21:44 +02:00 |
|
l10n daemon script
|
69bc07498d
|
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"
|
2017-06-20 04:32:58 +02:00 |
|
l10n daemon script
|
67216063fd
|
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"
|
2017-01-09 06:03:34 +01:00 |
|
l10n daemon script
|
4448caacaa
|
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"
|
2017-01-05 05:58:54 +01:00 |
|
l10n daemon script
|
e3741c0570
|
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-12-20 13:25:24 +01:00 |
|
l10n daemon script
|
c4e2b393ad
|
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-12-13 04:10:48 +01:00 |
|
l10n daemon script
|
6d0b1b3edc
|
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-24 04:13:56 +01:00 |
|
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 |
|
Jonathan Riddell
|
ee6cd11efb
|
switch from kdelibs4 sound files to plasma 5 sound file
|
2016-10-21 17:49:38 +01: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
|
8414b59811
|
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-11 10:34:23 +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 |
|
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 |
|