Commit graph

19 commits

Author SHA1 Message Date
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
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
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
728f6757d0 different icon 2015-06-22 20:03:05 -07:00
Marco Martin
62df66b045 rename homescreen library 2015-05-14 18:13:00 +02:00
Martin Klapetek
4267242ac0 [phonebook] Make use of the SectionScroller 2015-05-12 13:29:21 +02:00
Martin Klapetek
f45474eba3 Add the custom SectionScroller
This now copies to look from the mockup
2015-05-12 13:29:21 +02:00
Marco Martin
015c03b75d invoke the dialer 2015-05-05 20:13:10 +02:00
Martin Klapetek
6972b67c18 Initial phonebook application commit 2015-05-05 17:23:31 +02:00