Commit graph

4 commits

Author SHA1 Message Date
l10n daemon script
cb08f61786 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-11 10:29:16 +00:00
l10n daemon script
c05e355003 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-10 10:24:56 +00:00
l10n daemon script
c8de289e6f 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-09 10:02:17 +00:00
Thomas Lübking
fb39fafc71 add eye On Screen effect for showing desktop
resembles the homescreen effect on "eye" OS

REVIEW: 122679
2015-04-07 23:59:18 +02:00