Commit graph

11 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
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
Marco Martin
4dbdce0fc4 use parameter to support the call:// uris 2015-05-05 19:45:13 +02:00
Marco Martin
c267e6e689 support call://number as paramenter 2015-05-05 19:29:48 +02:00
Marco Martin
fc047fd462 c++ app with daemon option
the app never closes, reinvoking it makes it show
2015-04-21 12:12:10 +02:00
Marco Martin
c162599b95 move dialer in a subdir, prepare for the c++ part 2015-04-21 11:28:29 +02:00
Renamed from dialer/metadata.desktop (Browse further)