Commit Graph

9 Commits

Author SHA1 Message Date
l10n daemon script 9ad78c5c4c 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"
2015-04-19 10:15:54 +00:00
l10n daemon script d761cd090f 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"
2015-04-06 09:52:22 +00:00
l10n daemon script 2f780df746 SVN_SILENT made messages (.desktop file) 2015-02-28 11:35:37 +00:00
l10n daemon script 29d5ed031e SVN_SILENT made messages (.desktop file) 2015-02-27 11:40:43 +00:00
l10n daemon script 717aea24eb SVN_SILENT made messages (.desktop file) 2015-01-09 09:33:01 +00:00
l10n daemon script c2d15e97ff SVN_SILENT made messages (.desktop file) 2015-01-06 10:54:53 +00:00
l10n daemon script d41bb47000 SVN_SILENT made messages (.desktop file) 2015-01-01 08:57:04 +00:00
l10n daemon script 1160156229 SVN_SILENT made messages (.desktop file) 2014-12-21 09:02:01 +00:00
Andrius Štikonas 4ee6c52843 Port to reverse dns desktop 2014-11-20 11:35:26 +02:00